From 6e1316cb95afeb6be19be7852b895e1638357c92 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Fri, 1 Feb 2013 19:41:23 +0600
Subject: [PATCH] Fixes up some merge issues.

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      | 45 +++++++++----------
 src/Umbraco.Web.UI/packages.config            |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 src/Umbraco.Web/packages.config               |  2 +-
 src/umbraco.cms/businesslogic/web/Document.cs | 11 -----
 5 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d8f16edbd6..d1e477624e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -121,17 +121,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MySql.Data.6.6.4\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Our.Umbraco.uGoLive, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
+    <Reference Include="Our.Umbraco.uGoLive">
+      <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
     </Reference>
-    <Reference Include="Our.Umbraco.uGoLive.47x, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
+    <Reference Include="Our.Umbraco.uGoLive.47x">
+      <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
     </Reference>
-    <Reference Include="Our.Umbraco.uGoLive.Checks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
+    <Reference Include="Our.Umbraco.uGoLive.Checks">
+      <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -1834,23 +1831,23 @@
       <DependentUpon>applications.config</DependentUpon>
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Umbraco\scripting\templates\cshtml\EmptyTemplate.cshtml">
+    <Content Include="Umbraco\Scripting\templates\cshtml\EmptyTemplate.cshtml">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Umbraco\scripting\templates\cshtml\Gallery.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListAncestorsFromCurrentPage.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListChildPagesFromChangeableSource.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListChildPagesFromCurrentPage.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListChildPagesOrderedByDate.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListChildPagesOrderedByName.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListChildPagesOrderedByProperty.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListChildPagesWithDoctype.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListDescendantsFromCurrentPage.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\ListImagesFromMediaFolder.cshtml">
+    <Content Include="Umbraco\Scripting\templates\cshtml\Gallery.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListAncestorsFromCurrentPage.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListChildPagesFromChangeableSource.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListChildPagesFromCurrentPage.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListChildPagesOrderedByDate.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListChildPagesOrderedByName.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListChildPagesOrderedByProperty.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListChildPagesWithDoctype.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListDescendantsFromCurrentPage.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\ListImagesFromMediaFolder.cshtml">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Umbraco\scripting\templates\cshtml\MultinodeTree-picker.cshtml" />
-    <Content Include="Umbraco\scripting\templates\cshtml\TwitterFeed.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\MultinodeTree-picker.cshtml" />
+    <Content Include="Umbraco\Scripting\templates\cshtml\TwitterFeed.cshtml" />
     <None Include="umbraco_client\CodeMirror\js\mode\coffeescript\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\pascal\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\perl\LICENSE" />
@@ -1860,7 +1857,9 @@
     <Content Include="umbraco_client\CodeMirror\js\mode\sieve\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\xquery\LICENSE" />
     <Content Include="Views\Web.config" />
-    <Content Include="Web.config" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="web.Template.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 599bc4bf22..d03d68a4c5 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -11,6 +11,6 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="MySql.Data" version="6.6.4" targetFramework="net40" />
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
-  <package id="uGoLive" version="1.3.0" targetFramework="net40" />
+  <package id="uGoLive" version="1.4.0" targetFramework="net40" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fee460bb76..fab5647622 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -124,7 +124,7 @@
       <Private>True</Private>
       <HintPath>..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\NuGet.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Our.Umbraco.uGoLive">
+    <Reference Include="Our.Umbraco.uGoLive">      
       <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
     </Reference>
     <Reference Include="Our.Umbraco.uGoLive.47x">
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index eaacf49624..41edbfed34 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
-  <package id="uGoLive" version="1.3.0" targetFramework="net40" />
+  <package id="uGoLive" version="1.4.0" targetFramework="net40" />
   <package id="UmbracoExamine" version="0.1.42.2941" targetFramework="net40" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs
index eee60b3a1a..c80264b0df 100644
--- a/src/umbraco.cms/businesslogic/web/Document.cs
+++ b/src/umbraco.cms/businesslogic/web/Document.cs
@@ -1044,17 +1044,6 @@ namespace umbraco.cms.businesslogic.web
                 // Make the new document
                 var content = ApplicationContext.Current.Services.ContentService.Copy(Content, CopyTo, RelateToOrignal, u.Id);
                 newDoc = new Document(content);
-                        IDataType tagsField = new Factory().GetNewObject(new Guid("4023e540-92f5-11dd-ad8b-0800200c9a66"));
-                        }
-                        else if (p.PropertyType.DataTypeDefinition.DataType.Id == tagsField.Id &&
-                                 p.Value.ToString() != "")
-                        {
-                            //Find tags from the original and add them to the new document
-                            var tags = Tags.Tag.GetTags(this.Id);
-                            foreach (var tag in tags)
-                            {
-                                Tags.Tag.AddTagsToNode(newDoc.Id, tag.TagCaption, tag.Group);
-                            }
                 
                 // Have to run the ActionNew handler to do umbEnsureUniqueName (for example)
                 BusinessLogic.Actions.Action.RunActionHandlers(newDoc, ActionNew.Instance);