summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2013-06-27 01:41:31 (GMT)
committerDries2013-06-27 01:41:31 (GMT)
commitda1234fb74994f34bc3795451b4deb43c131f4a1 (patch)
tree96985692d9cab4976602dd7ea0f75ad896305b8d
parent3179dd42b8405aa743638071a743abd4a8555726 (diff)
Issue #2028457 by Wim Leers: Fixed Configuring CKEditor's ACF broke CKEditor configuration -> filter setting syncing.
-rw-r--r--core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index 5ab4961..9f40120 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -116,6 +116,10 @@ class CKEditor extends EditorBase {
'plugins' => $editor->settings['plugins'],
),
));
+ $config = $this->getJSSettings($fake_editor);
+ // Remove the ACF configuration that is generated based on filter settings,
+ // because otherwise we cannot retrieve per-feature metadata.
+ unset($config['allowedContent']);
$form['hidden_ckeditor'] = array(
'#markup' => '<div id="ckeditor-hidden" class="element-hidden"></div>',
'#attached' => array(
@@ -123,7 +127,7 @@ class CKEditor extends EditorBase {
array(
'type' => 'setting',
'data' => array('ckeditor' => array(
- 'hiddenCKEditorConfig' => $this->getJSSettings($fake_editor),
+ 'hiddenCKEditorConfig' => $config,
)),
),
),