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

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Shannon
2015-07-24 12:13:31 +02:00
parent 8b86276011 abf8777b0a
commit 293568228c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -558,8 +558,8 @@ namespace Umbraco.Web.Editors
if (foundContent == null)
HandleContentNotFound(id);
Services.ContentService.UnPublish(foundContent);
Services.ContentService.UnPublish(foundContent, Security.CurrentUser.Id);
var content = Mapper.Map<IContent, ContentItemDisplay>(foundContent);
content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));

6
src/Umbraco.Web/Editors/MediaController.cs
View File

@@ -349,7 +349,7 @@ namespace Umbraco.Web.Editors
{
var mediaService = ApplicationContext.Services.MediaService;
var f = mediaService.CreateMedia(folder.Name, folder.ParentId, Constants.Conventions.MediaTypes.Folder);
mediaService.Save(f);
mediaService.Save(f, Security.CurrentUser.Id);
return Mapper.Map<IMedia, MediaItemDisplay>(f);
}
@@ -416,7 +416,7 @@ namespace Umbraco.Web.Editors
mediaType = Constants.Conventions.MediaTypes.Image;
var mediaService = ApplicationContext.Services.MediaService;
var f = mediaService.CreateMedia(fileName, parentId, mediaType);
var f = mediaService.CreateMedia(fileName, parentId, mediaType, Security.CurrentUser.Id);
var fileInfo = new FileInfo(file.LocalFileName);
var fs = fileInfo.OpenReadWithRetry();
@@ -426,7 +426,7 @@ namespace Umbraco.Web.Editors
f.SetValue(Constants.Conventions.Media.File, fileName, fs);
}
mediaService.Save(f);
mediaService.Save(f, Security.CurrentUser.Id);
}
else
{