From 0a6237af042b0dd353da25c07ab55fed3c8a9319 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 21:13:11 +1000
Subject: [PATCH] Gets the multi url picker working with ignore start nodes

---
 .../src/common/services/tinymce.service.js       | 13 +++++++------
 .../linkpicker/linkpicker.controller.js          | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index d0d2d06479..3355b15570 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1170,14 +1170,15 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             //Create the insert media plugin
             self.createMediaPicker(args.editor, function (currentTarget, userData) {
 
+                var startNodeId, startNodeIsVirtual;
                 if (!args.model.config.startNodeId) {
                     if (args.model.config.ignoreUserStartNodes === true) {
-                        args.model.config.startNodeId = -1;
-                        args.model.config.startNodeIsVirtual = true;
+                        startNodeId = -1;
+                        startNodeIsVirtual = true;
                     }
                     else {
-                        args.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                        args.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                        startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        startNodeIsVirtual = userData.startMediaIds.length !== 1;
                     }
                 }
 
@@ -1186,8 +1187,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     onlyImages: true,
                     showDetails: true,
                     disableFolderSelect: true,
-                    startNodeId: args.model.config.startNodeId,
-                    startNodeIsVirtual: args.model.config.startNodeIsVirtual,
+                    startNodeId: startNodeId,
+                    startNodeIsVirtual: startNodeIsVirtual,
                     dataTypeId: args.model.dataTypeId,
                     submit: function (model) {
                         self.insertMediaInEditor(args.editor, model.selection[0]);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index d1743baf10..f09acbcc6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -161,9 +161,21 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
 
         $scope.switchToMediaPicker = function () {
             userService.getCurrentUser().then(function (userData) {
+
+                var startNodeId, startNodeIsVirtual;
+                if (dialogOptions.ignoreUserStartNodes === true) {
+                    startNodeId = -1;
+                    startNodeIsVirtual = true;
+                }
+                else {
+                    startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                    startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                }
+
                 var mediaPicker = {
-                    startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
-                    startNodeIsVirtual: userData.startMediaIds.length !== 1,
+                    startNodeId: startNodeId,
+                    startNodeIsVirtual: startNodeIsVirtual,
+                    dataTypeId: dialogOptions.dataTypeId,
                     submit: function (model) {
                         var media = model.selection[0];