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

Work items: 29795

Browse Source
This commit is contained in:
hartvig
2011-09-14 16:02:32 -02:00
parent c32e813210
commit 3522d68755
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config templates/config/umbracoSettings.config
View File

@@ -70,7 +70,7 @@
<UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
<!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
<!-- Setting this to false can increase render time for pages with a large number of links -->
<!-- Setting this to true can increase render time for pages with a large number of links -->
<!-- If running Umbraco in virtual directory this *must* be set to true! -->
<ResolveUrlsFromTextString>true</ResolveUrlsFromTextString>
</content>

2
umbraco/businesslogic/BasePages/UmbracoEnsuredPage.cs
View File

@@ -61,7 +61,7 @@ namespace umbraco.BasePages
if (permissions.IndexOf(Action) > -1 && (Path.Contains("-20") || ("," + Path + ",").Contains("," + getUser().StartNodeId.ToString() + ",")))
return true;
Log.Add(LogTypes.LoginFailure, getUser(), -1, "Insufient permissions in UmbracoEnsuredPage: '" + Path + "', '" + permissions + "', '" + Action + "'");
Log.Add(LogTypes.LoginFailure, getUser(), -1, "Insufficient permissions in UmbracoEnsuredPage: '" + Path + "', '" + permissions + "', '" + Action + "'");
return false;
}

2
umbraco/cms/businesslogic/datatype/DataTypeDefinition.cs
View File

@@ -177,7 +177,7 @@ namespace umbraco.cms.businesslogic.datatype
XmlAttribute val = xmlPv.Attributes["Value"];
if (val != null && !string.IsNullOrEmpty(val.Value))
if (val != null &&)
{
PreValue p = new PreValue(0, 0, val.Value);
p.DataTypeId = dtd.Id;

2
umbraco/presentation/config/umbracoSettings.config
View File

@@ -61,6 +61,8 @@
<UseLegacyXmlSchema>false</UseLegacyXmlSchema>
<cloneXmlContent>true</cloneXmlContent>
<ForceSafeAliases>true</ForceSafeAliases>
<PreviewBadge><![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="{0}/endPreview.aspx?redir={2}"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>