From 8b1bc267b5666f9c4242fcbde0cbc53a2e90c2b8 Mon Sep 17 00:00:00 2001
From: Denis Chenu <courriel@shnoulle.net>
Date: Sun, 3 Aug 2014 12:15:43 +0200
Subject: [PATCH] Fixed issue : HTML editor broke using < > ... in Expression
 Dev: see http://manual.limesurvey.org/Expression_Manager#HTML_editor_issue
 Dev: HTML produced with XSS is better than without ( outside EM < is replaced
 by &lt; with xss) Dev: todo : replace xssFilter by textFilter and allow
 plugin to do something

---
 scripts/admin/ckeditor-config.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/scripts/admin/ckeditor-config.js b/scripts/admin/ckeditor-config.js
index 2bd062f91d2..22005d19c00 100644
--- a/scripts/admin/ckeditor-config.js
+++ b/scripts/admin/ckeditor-config.js
@@ -14,11 +14,11 @@ CKEDITOR.editorConfig = function( config )
     config.toolbarCanCollapse = false;
     config.resize_enabled = false;
     config.autoParagraph = false;
-    config.entities = false;    
-	
-	if($('html').attr('dir') == 'rtl') {
-		config.contentsLangDirection = 'rtl';
-	}
+    config.basicEntities = false;
+
+    if($('html').attr('dir') == 'rtl') {
+        config.contentsLangDirection = 'rtl';
+    }
 
     config.toolbar_popup =
     [
@@ -37,7 +37,6 @@ CKEDITOR.editorConfig = function( config )
         ['TextColor','BGColor'],
         [ 'ShowBlocks','Templates']
     ];
-    
     config.toolbar_inline =
     [
         ['Maximize','Createlimereplacementfields'],
@@ -55,10 +54,6 @@ CKEDITOR.editorConfig = function( config )
         ['TextColor','BGColor'],
         [ 'ShowBlocks','Templates'],
     ];
-
-
-   
-
    config.toolbar_inline2 =
     [
         ['Maximize','Createlimereplacementfields'],
@@ -68,12 +63,7 @@ CKEDITOR.editorConfig = function( config )
         ['Link','Unlink','Image'],
         ['Source']
     ];
-
-
     config.extraPlugins = "ajax,limereplacementfields";
-
-    
-
 };
 
 (function () {