|
- <%=umbraco.ui.Text("preview", UmbracoUser)%>:
+ <%=umbraco.ui.Text("preview", base.getUser())%>:
|
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 24ccf4b587..ede0ce13bd 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -175,7 +175,7 @@
-
+
diff --git a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
index 7db655f5a8..715fc674a7 100644
--- a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
+++ b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
@@ -36,14 +36,14 @@ namespace Umbraco.Web.Mvc
///
/// Returns an instance of the default controller instance.
///
- public RenderMvcController GetControllerInstance()
+ public IRenderMvcController GetControllerInstance()
{
//try the dependency resolver, then the activator
var instance = DependencyResolver.Current.GetService(Value) ?? Activator.CreateInstance(Value);
- var result = instance as RenderMvcController;
+ var result = instance as IRenderMvcController;
if (result == null)
{
- throw new InvalidOperationException("Could not create an instance of " + Value + " for the default RenderMvcController");
+ throw new InvalidOperationException("Could not create an instance of " + Value + " for the default " + typeof(IRenderMvcController).Name);
}
return result;
}
@@ -64,9 +64,9 @@ namespace Umbraco.Web.Mvc
///
private void ValidateType(Type type)
{
- if (TypeHelper.IsTypeAssignableFrom (type) == false)
+ if (TypeHelper.IsTypeAssignableFrom(type) == false)
{
- throw new InvalidOperationException("The Type specified (" + type + ") is not of type " + typeof(RenderMvcController));
+ throw new InvalidOperationException("The Type specified (" + type + ") is not of type " + typeof(IRenderMvcController));
}
}
diff --git a/src/Umbraco.Web/Mvc/IRenderMvcController.cs b/src/Umbraco.Web/Mvc/IRenderMvcController.cs
new file mode 100644
index 0000000000..de4dc1045a
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/IRenderMvcController.cs
@@ -0,0 +1,18 @@
+using System.Web.Mvc;
+using Umbraco.Web.Models;
+
+namespace Umbraco.Web.Mvc
+{
+ ///
+ /// The interface that must be implemented for a controller to be designated to execute for route hijacking
+ ///
+ public interface IRenderMvcController : IController
+ {
+ ///
+ /// The default action to render the front-end view
+ ///
+ ///
+ ///
+ ActionResult Index(RenderModel model);
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
index 014b0c1e48..4fa9702a61 100644
--- a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
+++ b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Web.Mvc
//now we need to check if it exists, if not we need to return the Index by default
if (ad == null)
{
- //check if the controller is an instance of RenderMvcController
- if (controllerContext.Controller is RenderMvcController)
+ //check if the controller is an instance of IRenderMvcController
+ if (controllerContext.Controller is IRenderMvcController)
{
return new ReflectedActionDescriptor(controllerContext.Controller.GetType().GetMethod("Index"), "Index", controllerDescriptor);
}
diff --git a/src/Umbraco.Web/Mvc/RenderControllerFactory.cs b/src/Umbraco.Web/Mvc/RenderControllerFactory.cs
index 9482815a03..ccc80782a5 100644
--- a/src/Umbraco.Web/Mvc/RenderControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/RenderControllerFactory.cs
@@ -1,3 +1,4 @@
+using System.Web.Mvc;
using System.Web.Routing;
namespace Umbraco.Web.Mvc
@@ -22,5 +23,27 @@ namespace Umbraco.Web.Mvc
return dataToken == null || string.IsNullOrWhiteSpace(dataToken.ToString());
}
+ ///
+ /// Creates the controller
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// We always set the correct ActionInvoker on our custom created controller, this is very important for route hijacking!
+ ///
+ public override IController CreateController(RequestContext requestContext, string controllerName)
+ {
+ var instance = base.CreateController(requestContext, controllerName);
+ var controllerInstance = instance as Controller;
+ if (controllerInstance != null)
+ {
+ //set the action invoker!
+ controllerInstance.ActionInvoker = new RenderActionInvoker();
+ }
+
+ return instance;
+ }
+
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index 4615937e6b..b11ee8efc3 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Web.Mvc
///
/// A controller to render front-end requests
///
- public class RenderMvcController : UmbracoController
+ public class RenderMvcController : UmbracoController, IRenderMvcController
{
public RenderMvcController()
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index b7342119c9..6756847980 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -271,8 +271,9 @@ namespace Umbraco.Web.Mvc
//check if that controller exists
if (controllerType != null)
{
- //ensure the controller is of type 'RenderMvcController'
- if (TypeHelper.IsTypeAssignableFrom(controllerType))
+ //ensure the controller is of type 'IRenderMvcController' and ControllerBase
+ if (TypeHelper.IsTypeAssignableFrom(controllerType)
+ && TypeHelper.IsTypeAssignableFrom(controllerType))
{
//set the controller and name to the custom one
def.ControllerType = controllerType;
@@ -285,10 +286,11 @@ namespace Umbraco.Web.Mvc
else
{
LogHelper.Warn(
- "The current Document Type {0} matches a locally declared controller of type {1}. Custom Controllers for Umbraco routing must inherit from '{2}'.",
+ "The current Document Type {0} matches a locally declared controller of type {1}. Custom Controllers for Umbraco routing must implement '{2}' and inherit from '{3}'.",
() => publishedContentRequest.PublishedContent.DocumentTypeAlias,
() => controllerType.FullName,
- () => typeof (RenderMvcController).FullName);
+ () => typeof(IRenderMvcController).FullName,
+ () => typeof(ControllerBase).FullName);
//exit as we cannnot route to the custom controller, just route to the standard one.
return def;
}
diff --git a/src/Umbraco.Web/Mvc/SurfaceControllerFactory.cs b/src/Umbraco.Web/Mvc/SurfaceControllerFactory.cs
index a6eeda68d6..c82c59db65 100644
--- a/src/Umbraco.Web/Mvc/SurfaceControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceControllerFactory.cs
@@ -7,6 +7,7 @@ namespace Umbraco.Web.Mvc
///
/// Creates SurfaceControllers
///
+ [Obsolete("This is not used in the codebase and will be removed from the core in future versions")]
public class SurfaceControllerFactory : RenderControllerFactory
{
///
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6bef467ed0..be16cbb25d 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -413,6 +413,7 @@
+
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
index 955b885692..4106275165 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
@@ -226,7 +226,7 @@ namespace umbraco.controls.GenericProperties
checkMandatory.Checked = true;
// validation
- if (_pt != null && _pt.ValidationRegExp != "")
+ if (_pt != null && string.IsNullOrEmpty(_pt.ValidationRegExp) == false)
tbValidation.Text = _pt.ValidationRegExp;
// description
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
index 46ee8f3f80..5e3f16ca0c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
@@ -42,7 +42,7 @@ namespace umbraco
public bool Save()
{
- string[] scriptFileAr = _alias.Split('¤');
+ string[] scriptFileAr = _alias.Split('\u00A4');
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
index ea6de5b968..2b8e9e16b0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
index fd16f91b03..d2c72fef2a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%>
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets
index 6bceb13987..79eb7c494d 100644
--- a/src/umbraco.presentation.targets
+++ b/src/umbraco.presentation.targets
@@ -39,17 +39,22 @@
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
-
-
+
+
|