();
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 86a5459a74..fd6cadc04e 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations;
using System.Web;
using System.Web.Mvc;
using Umbraco.Core;
-using Umbraco.Core.Composing;
using Umbraco.Web.Security;
using Current = Umbraco.Web.Composing.Current;
@@ -65,7 +64,7 @@ namespace Umbraco.Web.Models
///
[Required]
public string Password { get; set; }
-
+
///
/// The username of the model, if UsernameIsEmail is true then this is ignored.
///
diff --git a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
index ae8da1fc6c..e1f9022f27 100644
--- a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
@@ -37,9 +37,9 @@ namespace Umbraco.Web.Routing
reason = "No template exists to render the document at url '{0}'.";
response.Write("Page not found
");
- response.Write("");
+ response.Write("");
response.Write(string.Format(reason, HttpUtility.HtmlEncode(Current.UmbracoContext.OriginalRequestUrl.PathAndQuery)));
- response.Write("
");
+ response.Write("");
if (string.IsNullOrWhiteSpace(_message) == false)
response.Write("" + _message + "
");
response.Write("This page can be replaced with a custom 404. Check the documentation for \"custom 404\".
");
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 1bc8df5b24..6a2fba1152 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -70,24 +70,31 @@ namespace Umbraco.Web
#endregion
// ensures that we can return the specified value
+ [Obsolete("This method is only used in Obsolete properties")]
T Ensure(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
+ [Obsolete("Inject and use an instance of " + nameof(IUmbracoComponentRenderer) + " in the constructor for using it in classes or get it from Current.UmbracoComponentRenderer in views.")]
private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
+
+ [Obsolete("Inject and use an instance of " + nameof(ICultureDictionaryFactory) + " in the constructor for using it in classes or get it from Current.CultureDictionaryFactory in views.")]
private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);
///
/// Gets the tag context.
///
+ [Obsolete("Inject and use an instance of " + nameof(ITagQuery) + " in the constructor for using it in classes or get it from Current.TagQuery in views.")]
public ITagQuery TagQuery => Ensure(_tagQuery);
///
/// Gets the query context.
///
+ [Obsolete("Inject and use an instance of " + nameof(IPublishedContentQuery) + " in the constructor for using it in classes or get it from Current.PublishedContentQuery in views")]
public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
///
/// Gets the membership helper.
///
+ [Obsolete("Inject and use an instance of " + nameof(Security.MembershipHelper) + " in the constructor instead. In views you can use @Members.")]
public MembershipHelper MembershipHelper => Ensure(_membershipHelper);
///