diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index d2236bab70..91627edb8b 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
{
internal class ContentElement : UmbracoConfigurationElement, IContentSection
{
- private const string DefaultPreviewBadge = @"In Preview Mode - click to end";
+ private const string DefaultPreviewBadge = @"In Preview Mode - click to end";
[ConfigurationProperty("imaging")]
internal ContentImagingElement Imaging => (ContentImagingElement) this["imaging"];
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index f1ac463305..962d6d13a9 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
[Test]
public void PreviewBadge()
{
- Assert.AreEqual(SettingsSection.Content.PreviewBadge, @"In Preview Mode - click to end");
+ Assert.AreEqual(SettingsSection.Content.PreviewBadge, @"In Preview Mode - click to end");
}
[Test]
public void ResolveUrlsFromTextString()
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index a436dad9f5..4c64485503 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -77,7 +77,7 @@
In Preview Mode - click to end
+ In Preview Mode - click to end
]]>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 42c8b01e24..df6fe953fe 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -41,7 +41,7 @@
In Preview Mode - click to end
+ In Preview Mode - click to end
]]>
In Preview Mode - click to end
+ In Preview Mode - click to end
]]>
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 6a91d20ae0..6e119d68d9 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -88,5 +88,23 @@ namespace Umbraco.Web.Editors
// if (string.IsNullOrEmpty(editor)) throw new ArgumentNullException(nameof(editor));
// return View(_globalSettings.Path.EnsureEndsWith('/') + "Views/Preview/" + editor.Replace(".html", string.Empty) + ".cshtml");
//}
+
+ public ActionResult End(string redir = null)
+ {
+ var previewToken = Request.GetPreviewCookieValue();
+ var service = Current.PublishedSnapshotService;
+ service.ExitPreview(previewToken);
+
+ System.Web.HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
+
+ if (Uri.IsWellFormedUriString(redir, UriKind.Relative)
+ && redir.StartsWith("//") == false
+ && Uri.TryCreate(redir, UriKind.Relative, out Uri url))
+ {
+ return Redirect(url.ToString());
+ }
+
+ return Redirect("/");
+ }
}
}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ea3ff32220..d64e3dcd81 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -525,9 +525,6 @@
-
- ASPXCodeBehind
-
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs
deleted file mode 100644
index 822f346705..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Web;
-using System.Web.UI;
-using Umbraco.Core;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-using Umbraco.Web.PublishedCache;
-
-namespace umbraco.presentation
-{
- public class endPreview : Page
- {
- protected void Page_Load(object sender, EventArgs e)
- {
- var request = (new HttpRequestWrapper(Request));
-
- var previewToken = request.GetPreviewCookieValue();
- var service = Current.PublishedSnapshotService;
- service.ExitPreview(previewToken);
-
- HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
-
- var redir = Request.QueryString["redir"];
- Uri url = null;
-
- if (Uri.IsWellFormedUriString(redir, UriKind.Relative) == false
- || redir.StartsWith("//")
- || Uri.TryCreate(redir, UriKind.Relative, out url) == false)
- {
- Response.Redirect("/", true);
- }
-
- Response.Redirect(url.ToString(), true);
- }
- }
-}