summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/ckeditor.inc4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 272f73e..7e8f63a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,6 +23,7 @@ Wysiwyg 7.x-2.0, 2010-01-06
Wysiwyg 6.x-2.x, xxxx-xx-xx
---------------------------
+#1025296 by TwoD: Updated CKEditor to support iFrame button.
#737318 by TwoD: Fixed CKEditor default skin array not being reindexed.
by sun: Fixed coding style in wysiwyg_schema().
#964978 by sun, TwoD: Added hook_wysiwyg_editor_settings_alter() documentation.
diff --git a/editors/ckeditor.inc b/editors/ckeditor.inc
index 2e10346..8e24b8e 100644
--- a/editors/ckeditor.inc
+++ b/editors/ckeditor.inc
@@ -314,6 +314,7 @@ function wysiwyg_ckeditor_plugins($editor) {
'SelectAll' => t('Select all'), 'Find' => t('Search'), 'Replace' => t('Replace'),
'Flash' => t('Flash'), 'Smiley' => t('Smiley'),
'CreateDiv' => t('Div container'),
+ 'Iframe' => t('iFrame'),
'Maximize' => t('Maximize'),
'SpellChecker' => t('Check spelling'), 'Scayt' => t('Check spelling as you type'),
'About' => t('About'),
@@ -325,6 +326,9 @@ function wysiwyg_ckeditor_plugins($editor) {
if (version_compare($editor['installed version'], '3.1.0.4885', '<')) {
unset($plugins['default']['buttons']['CreateDiv']);
}
+ if (version_compare($editor['installed version'], '3.5.0.6260', '<')) {
+ unset($plugins['default']['buttons']['Iframe']);
+ }
return $plugins;
}