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

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Browse Source 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
This commit is contained in:
Shannon
2014-03-19 09:34:37 +11:00
parent 4bcf3983c5 668935548d
commit a25e6e0d2c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/umbraco.cms/businesslogic/language/Item.cs
View File

@@ -5,7 +5,8 @@ using System.Data;
using System.Linq;
using Umbraco.Core;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
using umbraco.DataLayer;
using umbraco.BusinessLogic;
using System.Collections.Generic;
@@ -135,8 +136,9 @@ namespace umbraco.cms.businesslogic.language
if (!hasText(key, languageId)) throw new ArgumentException("Key does not exist");
ApplicationContext.Current.DatabaseContext.Database.Update<LanguageTextDto>(
"set [value] = @value where LanguageId = @languageId And UniqueId = @key",
new { value = value, languageId = languageId, key = key });
string.Format("set {0} = @value where LanguageId = @languageId And UniqueId = @key",
SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("value")),
new {value = value, languageId = languageId, key = key});
}
/// <summary>