From 2e877aa446a7a491a4f8af548a0ddf4342a978db Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Mar 2015 17:42:57 +1100
Subject: [PATCH] fixes build errors

---
 src/Umbraco.Core/CoreBootManager.cs           |  6 ++---
 src/Umbraco.Core/Models/Template.cs           | 25 +++++++++----------
 .../Services/LocalizedTextService.cs          |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 19545987e9..81e87c645d 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -303,12 +303,10 @@ namespace Umbraco.Core
         {
             var builder = new ManifestBuilder(
                 ApplicationCache.RuntimeCache,
-            PropertyEditorResolver.Current = new PropertyEditorResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolvePropertyEditors());
-            ParameterEditorResolver.Current = new ParameterEditorResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolveParameterEditors());
                 new ManifestParser(new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), ApplicationCache.RuntimeCache));
 
-            PropertyEditorResolver.Current = new PropertyEditorResolver(() => PluginManager.Current.ResolvePropertyEditors(), builder);
-            ParameterEditorResolver.Current = new ParameterEditorResolver(() => PluginManager.Current.ResolveParameterEditors(), builder);
+            PropertyEditorResolver.Current = new PropertyEditorResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolvePropertyEditors(), builder);
+            ParameterEditorResolver.Current = new ParameterEditorResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolveParameterEditors(), builder);
 
             //setup the validators resolver with our predefined validators
             ValidatorsResolver.Current = new ValidatorsResolver(
diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs
index 29744a89fa..bf49f9ca4d 100644
--- a/src/Umbraco.Core/Models/Template.cs
+++ b/src/Umbraco.Core/Models/Template.cs
@@ -142,27 +142,26 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
         
-        	var clone = (Template)base.DeepClone()
-            //turn off change tracking
-            clone.DisableChangeTracking();
-            //need to manually assign since they are readonly properties
-            clone._alias = Alias;
-            clone._name = Name;
-            //this shouldn't really be needed since we're not tracking
-            clone.ResetDirtyProperties(false);
-            //re-enable tracking
-            clone.EnableChangeTracking();
-        
-        
             //We cannot call in to the base classes to clone because the base File class treats Alias, Name.. differently so we need to manually do the clone
 
             //Memberwise clone on Entity will work since it doesn't have any deep elements
             // for any sub class this will work for standard properties as well that aren't complex object's themselves.
             var clone = (Template)MemberwiseClone();
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //Automatically deep clone ref properties that are IDeepCloneable
-            DeepCloneHelper.DeepCloneRefProperties(this, clone);           
+            DeepCloneHelper.DeepCloneRefProperties(this, clone);
 
+            //TODO: This was part of the merge process, we need to test if this is required!!
+            ////need to manually assign since they are readonly properties
+            //clone._alias = Alias;
+            //clone._name = Name;
+
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
+
             return clone;
         }
 
diff --git a/src/Umbraco.Core/Services/LocalizedTextService.cs b/src/Umbraco.Core/Services/LocalizedTextService.cs
index a499ea7640..51c4d5dc1d 100644
--- a/src/Umbraco.Core/Services/LocalizedTextService.cs
+++ b/src/Umbraco.Core/Services/LocalizedTextService.cs
@@ -229,7 +229,7 @@ namespace Umbraco.Core.Services
             return "[" + key + "]";
         }
 
-        private static string GetFromXmlSource(IDictionary<CultureInfo, Lazy<XDocument>> xmlSource, CultureInfo culture, string area, string key, IDictionary<string, string> tokens)
+        private string GetFromXmlSource(IDictionary<CultureInfo, Lazy<XDocument>> xmlSource, CultureInfo culture, string area, string key, IDictionary<string, string> tokens)
         {
             if (xmlSource.ContainsKey(culture) == false)
             {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3194f60b12..8f581d6e45 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -275,7 +275,6 @@
     <Compile Include="ApplicationContextExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="Models\ContentEditing\Relation.cs" />
-    <Compile Include="Models\ContentExtensions.cs" />
     <Compile Include="HtmlStringUtilities.cs" />
     <Compile Include="Models\ContentEditing\RelationType.cs" />
     <Compile Include="IDynamicPublishedContentQuery.cs" />