From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 25 May 2016 05:58:27 +0000 (+0000)
Subject: Port Fix for CRM-18474 to 4.6
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=092bb89b6be4e9ab38678547f64f096f5ea8e144;p=civicrm-core.git

Port Fix for CRM-18474 to 4.6
---

diff --git a/ang/crmUtil.js b/ang/crmUtil.js
index b6a0d01310..fd2d361128 100644
--- a/ang/crmUtil.js
+++ b/ang/crmUtil.js
@@ -16,6 +16,11 @@
       var deferred = $q.defer();
       var p;
       var backend = crmApi.backend || CRM.api3;
+      if (params && params.body_html) {
+        // CRM-18474 - remove Unicode Character 'LINE SEPARATOR' (U+2028)
+        // and 'PARAGRAPH SEPARATOR' (U+2029) from the html if present.
+        params.body_html = params.body_html.replace(/([\u2028]|[\u2029])/g, '\n');
+      }
       if (_.isObject(entity)) {
         // eval content is locally generated.
         /*jshint -W061 */