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

Merge

Browse Source
This commit is contained in:
sebastiaan
2012-09-14 11:23:42 -02:00
parent 26f32bab8e 29ed7bf8ae
commit 201bc2d1ab
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
View File

@@ -8,7 +8,6 @@ using System.Web;
using System.Web.UI;
using System.Xml;
using Umbraco.Core.Macros;
using Umbraco.Web.umbraco.templateControls;
using umbraco.cms.businesslogic;
using umbraco.cms.businesslogic.property;
using umbraco.cms.businesslogic.web;
@@ -203,7 +202,7 @@ namespace umbraco.presentation.templateControls
}
// add the XSLT expression into the full XSLT document, together with the needed parameters
string xslt = string.Format(Resources.InlineXslt, xpathExpression, disableEscaping ? "yes" : "no",
string xslt = string.Format(Umbraco.Web.umbraco.presentation.umbraco.templateControls.Resources.InlineXslt, xpathExpression, disableEscaping ? "yes" : "no",
namespaceList, namespaceDeclaractions);
// create the parameter

6
src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs generated
View File

@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.544
// Runtime Version:4.0.30319.269
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Umbraco.Web.umbraco.templateControls {
namespace Umbraco.Web.umbraco.presentation.umbraco.templateControls {
using System;
@@ -39,7 +39,7 @@ namespace Umbraco.Web.umbraco.templateControls {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.umbraco.templateControls.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.umbraco.presentation.umbraco.templateControls.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;