Ticket #5446: 5446_4.patch

_source/plugins/image/dialogs/image.js

@@ -1127 +1127 @@
                                                         {
                                                                 action : 'Browse',
                                                                 target: 'Link:txtUrl',
-                                                                url: editor.config.filebrowserImageBrowseLinkUrl || editor.config.filebrowserBrowseUrl
+                                                                url: editor.config.filebrowserImageBrowseLinkUrl
                                                         },
                                                         style : 'float:right',
                                                         hidden : true,

_source/plugins/filebrowser/plugin.js

@@ -261 +261 @@
 
                         if ( element.filebrowser.action == 'Browse' )
                         {
-                                var url = element.filebrowser.url || editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'BrowseUrl' ]
-                                                        || editor.config.filebrowserBrowseUrl;
+                                var url = element.filebrowser.url;
+                                if ( url === undefined )
+                                {
+                                        url = editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'BrowseUrl' ];
+                                        if ( url === undefined )
+                                                url = editor.config.filebrowserBrowseUrl;
+                                }
 
                                 if ( url )
                                 {
@@ -273 +278 @@
                         }
                         else if ( element.filebrowser.action == 'QuickUpload' && element[ 'for' ] )
                         {
-                                url =  element.filebrowser.url || editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'UploadUrl' ]
-                                                        || editor.config.filebrowserUploadUrl;
+                                var url = element.filebrowser.url;
+                                if ( url === undefined )
+                                {
+                                        url = editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'UploadUrl' ];
+                                        if ( url === undefined )
+                                                url = editor.config.filebrowserUploadUrl;
+                                }
 
                                 if ( url )
                                 {