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

fix merge issue

Browse Source
This commit is contained in:
Shannon
2017-05-17 20:08:53 +10:00
parent 765decf3b1
commit 9badb35c05
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Core/Services/MediaService.cs
View File

@@ -692,11 +692,11 @@ namespace Umbraco.Core.Services
}
Func<string, Sql> createSql = url => new Sql().Select("*")
.From<PropertyDataDto>()
.InnerJoin<PropertyTypeDto>()
.On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
.Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
.Where<PropertyDataDto>(x => x.VarChar == url);
.From<PropertyDataDto>()
.InnerJoin<PropertyTypeDto>()
.On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
.Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
.Where<PropertyDataDto>(x => x.VarChar == url);
var sql = createSql(umbracoFileValue);
@@ -899,16 +899,13 @@ namespace Umbraco.Core.Services
throw new ArgumentException("Cannot save media with empty name.");
}
var repository = RepositoryFactory.CreateMediaRepository(uow);
// set creator for new media
if (media.Id == 0)
{
var repository = RepositoryFactory.CreateMediaRepository(uow);
//set the creator id if it's new
if (media.HasIdentity == false)
{
media.CreatorId = userId;
}
}
repository.AddOrUpdate(media);
repository.AddOrUpdateContentXml(media, m => _entitySerializer.Serialize(this, _dataTypeService, _userService, m));
@@ -1057,7 +1054,7 @@ namespace Umbraco.Core.Services
/// <param name="userId">Optional id of the user deleting the media</param>
public void DeleteMediaOfType(int mediaTypeId, int userId = 0)
{
DeleteMediaOfTypes(new[] {mediaTypeId}, userId);
DeleteMediaOfTypes(new[] { mediaTypeId }, userId);
}
/// <summary>