summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--wysiwyg.module4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1949947..90ef393 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-2.x, xxxx-xx-xx
---------------------------
+#628110 by quicksketch, sun, markus_petrux: Added editor settings alter hook.
#689218 by wwalc, TwoD, sun: Improved support for CKEditor.
#695398 by TwoD: Updated support for TinyMCE 3.3.
#613096 by Scott Reynolds: Fixed no editor appearing for user signature field.
diff --git a/wysiwyg.module b/wysiwyg.module
index f7ccfd4..2de3d1c 100644
--- a/wysiwyg.module
+++ b/wysiwyg.module
@@ -540,6 +540,10 @@ function wysiwyg_get_editor_config($profile, $theme) {
$settings = array();
if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) {
$settings = $editor['settings callback']($editor, $profile->settings, $theme);
+
+ // Allow other modules to alter the editor settings for this format.
+ $context = array('editor' => $editor, 'profile' => $profile, 'theme' => $theme);
+ drupal_alter('wysiwyg_editor_settings', $settings, $context);
}
return $settings;
}