yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge issues

Browse Source
This commit is contained in:
Shannon
2013-09-10 11:51:57 +10:00
parent e962e86c3c
commit edc4dc6f7f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
View File

@@ -345,7 +345,7 @@ namespace Umbraco.Core.Persistence.Repositories
var parentDirectory = System.IO.Path.GetDirectoryName(relativeFilePath);
// don't want to delete the media folder if not using directories.
if (UmbracoSettings.UploadAllowDirectories && parentDirectory != fs.GetRelativePath("/"))
if (LegacyUmbracoSettings.UploadAllowDirectories && parentDirectory != fs.GetRelativePath("/"))
{
//issue U4-771: if there is a parent directory the recursive parameter should be true
fs.DeleteDirectory(parentDirectory, String.IsNullOrEmpty(parentDirectory) == false);

2
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
View File

@@ -289,7 +289,7 @@ namespace Umbraco.Tests.Persistence.Repositories
//assign the db context
new DatabaseContext(dbFactory),
//assign the service context
new ServiceContext(UnitOfWorkProvider, new FileUnitOfWorkProvider(), new PublishingStrategy()),
new ServiceContext(UnitOfWorkProvider, new FileUnitOfWorkProvider(), new PublishingStrategy(), cacheHelper),
//disable cache
cacheHelper)
{