From 66656959860fb56d1e4b48d9ea8030729a3593fa Mon Sep 17 00:00:00 2001
From: matthew-hair <matthew.hair@sedgwick.gov>
Date: Fri, 1 Feb 2019 14:01:12 -0600
Subject: [PATCH 1/2] Added null check for context.Identity

Signed-off-by: matthew-hair <matthew.hair@sedgwick.gov>
---
 .../Security/BackOfficeCookieAuthenticationProvider.cs       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs b/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
index 1a3b9f54ee..57075269d8 100644
--- a/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
+++ b/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
@@ -107,6 +107,11 @@ namespace Umbraco.Core.Security
 
             await EnsureValidSessionId(context);
 
+            if (context?.Identity == null)
+            {
+                context?.OwinContext.Authentication.SignOut(context.Options.AuthenticationType);
+                return;
+            }
             await base.ValidateIdentity(context);
         }        
 

From 3a469cdc77694f190574eeb5aa95d678d5e51f4f Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Thu, 14 Feb 2019 18:11:44 +0100
Subject: [PATCH 2/2] Multi Url Picker fixes (#4527)

*  Fix not being able to save link with only an anchor

* Don't allow Multi Url Picker as a parameter editor
---
 .../multiurlpicker/multiurlpicker.controller.js             | 6 +++---
 .../PropertyEditors/MultiUrlPickerPropertyEditor.cs         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 1795622aed..e4f2ae303f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -73,7 +73,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             currentTarget: target,
             show: true,
             submit: function (model) {
-                if (model.target.url) {
+                if (model.target.url || model.target.anchor) {
                     // if an anchor exists, check that it is appropriately prefixed
                     if (model.target.anchor && model.target.anchor[0] !== '?' && model.target.anchor[0] !== '#') {
                         model.target.anchor = (model.target.anchor.indexOf('=') === -1 ? '#' : '?') + model.target.anchor;
@@ -87,14 +87,14 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
                             link.isMedia = model.target.isMedia;
                         }
 
-                        link.name = model.target.name || model.target.url;
+                        link.name = model.target.name || model.target.url || model.target.anchor;
                         link.queryString = model.target.anchor;
                         link.target = model.target.target;
                         link.url = model.target.url;
                     } else {
                         link = {
                             isMedia: model.target.isMedia,
-                            name: model.target.name || model.target.url,
+                            name: model.target.name || model.target.url || model.target.anchor,
                             queryString: model.target.anchor,
                             target: model.target.target,
                             udi: model.target.udi,
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index 84523f05c4..a058a16b8a 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -15,7 +15,7 @@ using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [PropertyEditor(Constants.PropertyEditors.MultiUrlPickerAlias, "Multi Url Picker", PropertyEditorValueTypes.Json, "multiurlpicker", Group = "pickers", Icon = "icon-link", IsParameterEditor = true)]
+    [PropertyEditor(Constants.PropertyEditors.MultiUrlPickerAlias, "Multi Url Picker", PropertyEditorValueTypes.Json, "multiurlpicker", Group = "pickers", Icon = "icon-link")]
     public class MultiUrlPickerPropertyEditor : PropertyEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
@@ -112,7 +112,7 @@ namespace Umbraco.Web.PropertyEditors
                             Target = dto.Target,
                             Trashed = false,
                             Udi = dto.Udi,
-                            Url = dto.Url,
+                            Url = dto.Url ?? "",
                         };
 
                         links.Add(link);