diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_specialchar.html b/main/inc/lib/fckeditor/editor/dialog/fck_specialchar.html index ff17c52450..05f1a85bbb 100644 --- a/main/inc/lib/fckeditor/editor/dialog/fck_specialchar.html +++ b/main/inc/lib/fckeditor/editor/dialog/fck_specialchar.html @@ -77,7 +77,7 @@ function setDefaults() diff --git a/main/inc/lib/fckeditor/editor/filemanager/connectors/php/commands.php b/main/inc/lib/fckeditor/editor/filemanager/connectors/php/commands.php index dd1e20b8f9..7791104c0c 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/connectors/php/commands.php +++ b/main/inc/lib/fckeditor/editor/filemanager/connectors/php/commands.php @@ -94,6 +94,7 @@ function GetFoldersAndFiles( $resourceType, $currentFolder ) && ( $in_group || ( !$in_group && strpos( $sFile, '_groupdocs' ) === false ) ) && (!$in_shared_folder || ($in_shared_folder && (!$is_dir || ($is_dir && $sFile == $user_id)))) && $sFile != '.thumbs' + && strpos( $sFile, '.editor_' ) === false && $sFile != '.svn' ) { if ( $is_dir )