Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 5987)
+++ /CKEditor/trunk/CHANGES.html (revision 5988)
@@ -85,4 +85,5 @@
#6235 : BIDI: Applying direction to multi-paragraph selection within a div.
#6187 : [IE6] Multi-instance loading produces 404s on background images.
+ #5446 : Setting config.filebrowserImageBrowseUrl results in displaying also Browser Server on links.
Updated the following language files:
- #6427 : Ukrainian;
Index: /CKEditor/trunk/_source/plugins/filebrowser/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/filebrowser/plugin.js (revision 5987)
+++ /CKEditor/trunk/_source/plugins/filebrowser/plugin.js (revision 5988)
@@ -262,6 +262,11 @@
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 )
@@ -274,6 +279,11 @@
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 )
Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 5987)
+++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 5988)
@@ -1128,5 +1128,5 @@
action : 'Browse',
target: 'Link:txtUrl',
- url: editor.config.filebrowserImageBrowseLinkUrl || editor.config.filebrowserBrowseUrl
+ url: editor.config.filebrowserImageBrowseLinkUrl
},
style : 'float:right',