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

Fix the build

Browse Source
This commit is contained in:
Stephan
2014-05-18 21:41:34 +02:00
parent 28da44f0de
commit 9ed3561b56
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
View File

@@ -51,7 +51,7 @@ namespace Umbraco.Core.Models.PublishedContent
// a model, and then that model has to inherit from PublishedContentExtended,
// => implements the internal IPublishedContentExtended.
var model = content.CreateModel2();
var model = content.CreateModel();
var extended = model == content // == means the factory did not create a model
? new PublishedContentExtended(content) // so we have to extend
: model; // else we can use what the factory returned

2
src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Tests.PublishedContent
public void Add(SolidPublishedContent content)
{
_content[content.Id] = content.CreateModel2();
_content[content.Id] = content.CreateModel();
}
public void Clear()

2
src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
View File

@@ -221,7 +221,7 @@ namespace Umbraco.Tests.PublishedContent
var doc = GetNode(1173);
var items = doc.Children
.Select(x => x.CreateModel2()) // linq, returns IEnumerable<IPublishedContent>
.Select(x => x.CreateModel()) // linq, returns IEnumerable<IPublishedContent>
// only way around this is to make sure every IEnumerable<T> extension
// explicitely returns a PublishedContentSet, not an IEnumerable<T>

4
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
View File

@@ -242,13 +242,13 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
{
return xmlNode == null
? null
: (new XmlPublishedContent(xmlNode, isPreviewing)).CreateModel2();
: (new XmlPublishedContent(xmlNode, isPreviewing)).CreateModel();
}
private static IEnumerable<IPublishedContent> ConvertToDocuments(XmlNodeList xmlNodes, bool isPreviewing)
{
return xmlNodes.Cast<XmlNode>()
.Select(xmlNode => (new XmlPublishedContent(xmlNode, isPreviewing)).CreateModel2());
.Select(xmlNode => (new XmlPublishedContent(xmlNode, isPreviewing)).CreateModel());
}
#endregion

4
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
View File

@@ -255,7 +255,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
d => GetChildrenMedia(d.Id),
GetProperty,
true);
return content.CreateModel2();
return content.CreateModel();
}
internal IPublishedContent ConvertFromXPathNavigator(XPathNavigator xpath)
@@ -314,7 +314,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
d => GetChildrenMedia(d.Id, xpath),
GetProperty,
false);
return content.CreateModel2();
return content.CreateModel();
}
/// <summary>

4
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
View File

@@ -338,7 +338,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
if (parent == null) return;
if (parent.Name == "node" || (parent.Attributes != null && parent.Attributes.GetNamedItem("isDoc") != null))
_parent = (new XmlPublishedContent(parent, _isPreviewing, true)).CreateModel2();
_parent = (new XmlPublishedContent(parent, _isPreviewing, true)).CreateModel();
}
private void Initialize()
@@ -440,7 +440,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
var iterator = nav.Select(expr);
while (iterator.MoveNext())
_children.Add(
(new XmlPublishedContent(((IHasXmlNode)iterator.Current).GetNode(), _isPreviewing, true)).CreateModel2());
(new XmlPublishedContent(((IHasXmlNode)iterator.Current).GetNode(), _isPreviewing, true)).CreateModel());
// warn: this is not thread-safe
_childrenInitialized = true;