From 5625102e2c0bc37b1d3ff0ffd036834a89a30352 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 2 Jul 2019 12:42:18 +0200
Subject: [PATCH 1/2] making EditorValidatorOfT public instead of internal.

---
 src/Umbraco.Web/Editors/EditorValidatorOfT.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EditorValidatorOfT.cs b/src/Umbraco.Web/Editors/EditorValidatorOfT.cs
index 4ca008cf0d..715a49179e 100644
--- a/src/Umbraco.Web/Editors/EditorValidatorOfT.cs
+++ b/src/Umbraco.Web/Editors/EditorValidatorOfT.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Editors
     /// Provides a base class for <see cref="IEditorValidator"/> implementations.
     /// </summary>
     /// <typeparam name="T">The validated object type.</typeparam>
-    internal abstract class EditorValidator<T> : IEditorValidator
+    public abstract class EditorValidator<T> : IEditorValidator
     {
         public Type ModelType => typeof (T);
 
@@ -16,4 +16,4 @@ namespace Umbraco.Web.Editors
 
         protected abstract IEnumerable<ValidationResult> Validate(T model);
     }
-}
\ No newline at end of file
+}

From d5bc54cf6c4f7211ed3e4687c75c4a8659c54f20 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 2 Jul 2019 13:00:50 +0200
Subject: [PATCH 2/2] refixing #4708 - old merge error.

---
 src/Umbraco.Web.UI.Client/src/preview/preview.controller.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 7d6584d2f1..1316642e93 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -113,7 +113,10 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.exitPreview = function () {
 
             var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
+            var relativeUrl = "/" + $scope.pageId;
+            if (culture) {
+                relativeUrl += '?culture=' + culture;
+            }
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };