From 069db2b9451480fb1cbaa4bf9a5a857ecf66a60f Mon Sep 17 00:00:00 2001
From: Wiktor Walc <wwalc@184556.no-reply.drupal.org>
Date: Mon, 16 Feb 2009 10:58:18 +0000
Subject: [PATCH] #374386 Fixed: &#160 shows up in empty Body field when ProcessHTMLEntities is set to false

---
 CHANGELOG.txt      |    1 +
 fckeditor.utils.js |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6704dc6..89089ff 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ $Id$
 -- 2009-02-16 version 5.x-2.x-dev
 * #372150 Fixed: break tag shows up in empty Body field after saving
 * #330286 Removed the "Red Title" style from the default list of styles
+* #374386 Fixed: &#160 shows up in empty Body field when ProcessHTMLEntities is set to false
 
 -- 2009-01-23 version 5.x-2.x-dev
 * #352704 Fixed: moving an image corrupts its path
diff --git a/fckeditor.utils.js b/fckeditor.utils.js
index 81c4e18..64dd961 100644
--- a/fckeditor.utils.js
+++ b/fckeditor.utils.js
@@ -74,9 +74,9 @@ function Toggle( js_id, textareaID, textTextarea, TextRTE,  xss_check )
   else
   {
     text = oEditor.GetHTML(true);
-    // #372150
-    if (text == '<br />' || text == '<p></p>' || text == '<div></div>') {
-      text = '';
+    // #372150 and #374386
+    if (text == '<br />' || text == '<p>&#160;</p>' || text == '<div>&#160;</div>') {
+        text = '';
     }
     document.getElementById('switch_' + js_id).innerHTML = TextRTE;
 
-- 
1.7.4.1