diff --git a/main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js b/main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js index bb893a36d5..7834be0093 100644 --- a/main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js +++ b/main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js @@ -191,9 +191,13 @@ function OpenFileBrowser( url, width, height ) { var FCKDialog = oEditor.FCKDialog ; } + if ( !FCKLang ) + { + var FCKLang = oEditor.FCKLang ; + } } - // Otherwise FCK, FCKConfig and FCKDialog must be defined. + // Otherwise FCK, FCKConfig, FCKDialog and FCKLang must be defined. if ( ( FCKConfig.OpenSimpleFileManagerInANewWindow && FCKConfig.OpenSimpleFileManagerInANewWindow.toString() == 'true' ) && ( !FCKConfig.AdvancedFileManager || FCKConfig.AdvancedFileManager.toString() != 'true' ) ) @@ -211,7 +215,7 @@ function OpenFileBrowser( url, width, height ) } else { - FCKDialog.OpenDialog( 'FCKDialog_FileManager' , 'File Manager', url, width, height, '', window, true ) ; + FCKDialog.OpenDialog( 'FCKDialog_FileManager' , FCKLang['BrowseServer'], url, width, height, '', window, true ) ; } } diff --git a/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html b/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html index cdd81722d3..8eb0c7d59b 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html +++ b/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html @@ -75,22 +75,21 @@ if ( window.opener ) } else { - var dialog = window.parent ; - var oEditor = dialog.InnerDialogLoaded() ; - var FCK = oEditor.FCK ; - var FCKLang = oEditor.FCKLang ; - var FCKConfig = oEditor.FCKConfig ; + try + { + var dialog = window.parent ; + var oEditor = dialog.InnerDialogLoaded() ; + var FCKLang = oEditor.FCKLang ; + } + catch ( ex ) { } } - -// Initialization of some language variables. if ( !FCKLang ) { - FCKLang = [] ; -} -if ( !FCKLang['BrowseServer'] ) -{ - FCKLang['BrowseServer'] = 'Browse Server' ; + var FCKLang = [] ; } + +// Initialization of some language variables. +if ( !FCKLang['BrowseServer'] ) { FCKLang['BrowseServer'] = 'Browse Server' ; } FCKLang['FolderAlreadyExists'] = FCKLang['FolderAlreadyExists'] ? FCKLang['FolderAlreadyExists'] : 'Folder already exists.' ; FCKLang['InvalidFolderName'] = FCKLang['InvalidFolderName'] ? FCKLang['InvalidFolderName'] : 'Invalid folder name.' ; FCKLang['NoPermissionsToCreateFolder'] = FCKLang['NoPermissionsToCreateFolder'] ? FCKLang['NoPermissionsToCreateFolder'] : 'You have no permissions to create the folder.' ; diff --git a/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmactualfolder.html b/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmactualfolder.html index 3632042268..02b2b49552 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +++ b/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmactualfolder.html @@ -78,7 +78,7 @@ window.onload = function()
|
-
+
|