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

Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

Browse Source 
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
This commit is contained in:
Shannon
2016-01-06 10:46:38 +01:00
parent ac653e7f6d 5ad5e945c4
commit b0060a9592
17 changed files with 1261 additions and 1860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/WebServices/SaveFileController.cs
View File

@@ -156,8 +156,8 @@ namespace Umbraco.Web.WebServices
{
t = new Template(templateId)
{
Text = templateName.CleanForXss('[', ']', '(', ')'),
Alias = templateAlias.CleanForXss('[', ']', '(', ')'),
Text = templateName.CleanForXss('[', ']', '(', ')', ':'),
Alias = templateAlias.CleanForXss('[', ']', '(', ')', ':'),
Design = templateContents
};