From b5685a9d76003b5c2958433e0efe3ec898072b82 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 3 Jan 2018 09:07:26 +0000
Subject: [PATCH] Rollback modifications from r5192 as it introduced a
 regression.

JS escaping and previous value comparison strategies are to be define before going further with this matter.

SVN:trunk[5193]
---
 application/ui.htmleditorwidget.class.inc.php | 2 +-
 js/forms-json-utils.js                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/ui.htmleditorwidget.class.inc.php b/application/ui.htmleditorwidget.class.inc.php
index 8dfb804e4..683e372db 100644
--- a/application/ui.htmleditorwidget.class.inc.php
+++ b/application/ui.htmleditorwidget.class.inc.php
@@ -97,7 +97,7 @@ class UIHTMLEditorWidget
 		// The most relevant solution would be to implement a plugin to CKEdit, and handle the internal events like: setData, insertHtml, insertElement, loadSnapshot, key, afterUndo, afterRedo
 
 		// Could also be bound to 'instanceReady.ckeditor'
-		$oPage->add_ready_script("$('#$iId').bind('validate', function(evt, sFormId) { return ValidateCKEditField('$iId', '', {$this->m_sMandatory}, sFormId, '', '$sValue') } );\n");
+		$oPage->add_ready_script("$('#$iId').bind('validate', function(evt, sFormId) { return ValidateCKEditField('$iId', '', {$this->m_sMandatory}, sFormId, '') } );\n");
 		$oPage->add_ready_script(
 				<<<EOF
 $('#$iId').bind('update', function(evt){
diff --git a/js/forms-json-utils.js b/js/forms-json-utils.js
index f21fcce6b..9eb54a9e7 100644
--- a/js/forms-json-utils.js
+++ b/js/forms-json-utils.js
@@ -281,7 +281,7 @@ function ValidateCKEditField(sFieldId, sPattern, bMandatory, sFormId, nullValue,
 
 		// Get the original value without the tags
 		var oFormattedOriginalContents = (originalValue !== undefined) ? $('<div></div>').html(originalValue) : undefined;
-		var sTextOriginalContents = (oFormattedOriginalContents !== null) ? oFormattedOriginalContents.text() : undefined;
+		var sTextOriginalContents = (oFormattedOriginalContents !== undefined) ? oFormattedOriginalContents.text() : undefined;
 	
 		if (bMandatory && (sTextContent == nullValue))
 		{