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

Merge remote-tracking branch 'fork1/6.2.0-pubcontent' into 7.0.0-pubcontent

Browse Source
This commit is contained in:
Stephan
2013-09-26 09:12:02 +02:00
parent 02ffebde49 725b938de1
commit ce15d46a5e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
{
// so in dd.Properties, there is an IPublishedProperty with property type alias "__NodeTypeAlias" and
// that special property would contain the node type alias, which we use to get "aliases & names". That
// special property is going to be a PropertyResult (with ObjectValue == DataValue) and we
// special property is going to be a PropertyResult (with Value == DataValue) and we
// want its value in the most simple way = it is OK to use DataValue here.
var aliasesAndNames = ContentType.GetAliasesAndNames(dd.Properties.First(x => x.PropertyTypeAlias.InvariantEquals(UmbracoContentIndexer.NodeTypeAliasFieldName)).DataValue.ToString());
if (aliasesAndNames != null)

4
src/Umbraco.Web/umbraco.presentation/library.cs
View File

@@ -361,9 +361,9 @@ namespace umbraco
// where prop.Value is parsed for internal links + resolve urls - but not for macros
// comments say "fixing U4-917 and U4-821" which are not related
// if we return DataValue.ToString() we're back to the original situation
// if we return ObjectValue.ToString() we'll have macros parsed and that's nice
// if we return Value.ToString() we'll have macros parsed and that's nice
//
// so, use ObjectValue.ToString() here.
// so, use Value.ToString() here.
var prop = doc.GetProperty(alias);
return prop == null ? string.Empty : prop.Value.ToString();
}