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

applied patch from rev 189f37a1dd63 which reverts the last minute changes before 4.11

Browse Source 
release, namely changes to the ApplicationTreeRegistrar, TreeDefinitionCollection, theend installer step.
This commit is contained in:
Shannon Deminick
2012-11-27 21:45:57 +05:00
parent c612727116
commit 38a1179de5
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/umbraco.cms/businesslogic/template/MasterpageHelper.cs
View File

@@ -32,7 +32,7 @@ namespace umbraco.cms.businesslogic.template
if (!File.Exists(GetFilePath(t)) || overWrite)
{
masterpageContent = CreateDefaultMasterPageContent(t, t.Alias);
saveDesignToFile(t, null, masterpageContent);
SaveDesignToFile(t, null, masterpageContent);
}
else
{
@@ -59,9 +59,9 @@ namespace umbraco.cms.businesslogic.template
internal static string UpdateMasterPageFile(Template t, string currentAlias)
{
var template = updateMasterPageContent(t, currentAlias);
updateChildTemplates(t, currentAlias);
saveDesignToFile(t, currentAlias, template);
var template = UpdateMasterPageContent(t, currentAlias);
UpdateChildTemplates(t, currentAlias);
SaveDesignToFile(t, currentAlias, template);
return template;
}
@@ -137,7 +137,7 @@ namespace umbraco.cms.businesslogic.template
* */
}
internal static string updateMasterPageContent(Template template, string currentAlias)
internal static string UpdateMasterPageContent(Template template, string currentAlias)
{
var masterPageContent = template.Design;
@@ -174,7 +174,7 @@ namespace umbraco.cms.businesslogic.template
return masterPageContent;
}
private static void updateChildTemplates(Template t, string currentAlias)
private static void UpdateChildTemplates(Template t, string currentAlias)
{
//if we have a Old Alias if the alias and therefor the masterpage file name has changed...
//so before we save the new masterfile, we'll clear the old one, so we don't up with
@@ -192,7 +192,7 @@ namespace umbraco.cms.businesslogic.template
}
private static void saveDesignToFile(Template t, string currentAlias, string design)
private static void SaveDesignToFile(Template t, string currentAlias, string design)
{
//kill the old file..
if (!string.IsNullOrEmpty(currentAlias) && currentAlias != t.Alias)