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

Merge with 4.11.4

Browse Source
This commit is contained in:
Shannon Deminick
2013-02-01 19:23:56 +06:00
parent 39d45ba4b0 300d3ff09b
commit bfb8912518
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -124,17 +124,14 @@
<Private>True</Private>
<HintPath>..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\NuGet.Core.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>

11
src/umbraco.cms/businesslogic/web/Document.cs
View File

@@ -1044,6 +1044,17 @@ 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);