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

reverts last minute changes in 4.11 to get trees displaying on install so that we can determine the real cause.

Browse Source 
Fixes naming conventions on MasterpageHelper.
This commit is contained in:
Shannon Deminick
2012-11-27 06:58:58 +05:00
parent 4796cdd803
commit 060ebe2c4f
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
View File

@@ -2,15 +2,16 @@ using System.IO;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using umbraco.BusinessLogic;
using System;
using System.Data;
using System.Drawing;
using System.Web;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
namespace umbraco.presentation.install.steps
{
using System;
using System.Data;
using System.Drawing;
using System.Web;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
/// <summary>
/// Summary description for theend.
@@ -35,9 +36,6 @@ namespace umbraco.presentation.install.steps
if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
customizeSite.Visible = false;
var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
if(Directory.Exists(tempFolder))
Directory.Delete(tempFolder, true);
}
#region Web Form Designer generated code

8
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
View File

@@ -15,7 +15,6 @@ using umbraco.interfaces;
using umbraco.BusinessLogic.Utils;
using umbraco.BusinessLogic;
using umbraco.BasePages;
using TypeFinder = umbraco.BusinessLogic.Utils.TypeFinder;
namespace umbraco.cms.presentation.Trees
{
@@ -152,12 +151,11 @@ namespace umbraco.cms.presentation.Trees
l.UpgradeToWriteLock();
List<Type> foundITrees = TypeFinder.FindClassesOfType<ITree>();
//var foundITrees = PluginManager.Current.ResolveTrees();
var foundITrees = PluginManager.Current.ResolveTrees();
var objTrees = ApplicationTree.getAll();
List<ApplicationTree> appTrees = new List<ApplicationTree>();
//var appTrees = new List<ApplicationTree>();
var appTrees = new List<ApplicationTree>();
appTrees.AddRange(objTrees);
var apps = Application.getAll();

2
src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
View File

@@ -31,7 +31,7 @@ namespace umbraco.BusinessLogic
public ApplicationTreeRegistrar()
{
//don't do anything if the application is not configured!
if (!ApplicationContext.Current.IsConfigured)
if (ApplicationContext.Current == null || !ApplicationContext.Current.IsConfigured)
return;
// Load all Trees by attribute and add them to the XML config

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)