Merge pull request #658 from pupi1985/patch-110

Remove essential CKEditor configuration from config.js file

qa-plugin/wysiwyg-editor/ckeditor/config.js

@@ -27,9 +27,6 @@ CKEDITOR.editorConfig = function( config ) {
 	// Make dialogs simpler
 	config.removeDialogTabs = 'image:advanced;link:advanced;table:advanced';
 
-	// Use form upload instead of XHR
-	config.filebrowserUploadMethod = 'form';
-
 	// Use native spell checking (note: Ctrl+right-click is required for native context menu)
 	config.disableNativeSpellChecker = false;
 

qa-plugin/wysiwyg-editor/qa-wysiwyg-editor.php

@@ -170,6 +170,7 @@ class qa_wysiwyg_editor
 				// File uploads
 				($uploadimages ? "	filebrowserImageUploadUrl: $imageUploadUrl," : ""),
 				($uploadall ? "	filebrowserUploadUrl: $fileUploadUrl," : ""),
+				"	filebrowserUploadMethod: 'form',", // Use form upload instead of XHR
 
 				// Set language to Q2A site language, falling back to English if not available.
 				"	defaultLanguage: 'en',",