projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 81e7c60)
CRM-17924 - crm.ckeditor.js - Allow email-style tags+attributes
authorTim Otten <totten@civicrm.org>
Mon, 1 Feb 2016 18:49:32 +0000 (11:49 -0700)
committerTim Otten <totten@civicrm.org>
Mon, 1 Feb 2016 19:02:50 +0000 (12:02 -0700)
js/wysiwyg/crm.ckeditor.js patch | blob | blame | history

diff --git a/js/wysiwyg/crm.ckeditor.js b/js/wysiwyg/crm.ckeditor.js
index 4f8e9cb80d85adcd8e748035fd714912a5bea4d0..5130121f84574f52fffde179e27faf11b8166976 100644 (file)
--- a/js/wysiwyg/crm.ckeditor.js
+++ b/js/wysiwyg/crm.ckeditor.js
@@ -75,6 +75,7 @@
         filebrowserUploadUrl: uploadUrl + '&type=files',
         filebrowserImageUploadUrl: uploadUrl + '&type=images',
         filebrowserFlashUploadUrl: uploadUrl + '&type=flash',
+        allowedContent: true, // For CiviMail!
         customConfig: CRM.config.CKEditorCustomConfig,
         on: {
           instanceReady: onReady