SAK-31417 set elFinder as the default CKEditor file browser (sakaipro…

…ject#2944)
glennlevine · Jun 29, 2016 · f44ea29 · f44ea29
1 parent b3a4c0e
commit f44ea29
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -3367,9 +3367,9 @@
 # wysiwyg.twinpeaks=true
 
 # The file browser to use for picking files in ckeditor
-# The only other option is elfinder.
-# DEFAULT: fckeditor
-# wysiwyg.editor.ckeditor.browser=elfinder
+# The only other option is fckeditor.
+# DEFAULT: elfinder
+# wysiwyg.editor.ckeditor.browser=fckeditor
 
 
 # ########################################################################

diff --git a/kernel/kernel-util/src/main/java/org/sakaiproject/util/EditorConfiguration.java b/kernel/kernel-util/src/main/java/org/sakaiproject/util/EditorConfiguration.java
@@ -50,11 +50,11 @@ public static String getWysiwigEditor()
 
 	/**
 	 * Get the file browser that should be used when picking a file in CKEditor.
-	 * @return The file browser, i.e. fckeditor
+	 * @return The file browser, i.e. fckeditor, elfinder
 	 */
 	public static String getCKEditorFileBrowser()
 	{
-		return ServerConfigurationService.getString("wysiwyg.editor.ckeditor.browser", "fckeditor");
+		return ServerConfigurationService.getString("wysiwyg.editor.ckeditor.browser", "elfinder");
 	}
 
 	/**