summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/tinymce.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 057c78e..456ac8b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
Wysiwyg 6.x-2.x, xxxx-xx-xx
---------------------------
+#1153458 by Deciphered: Fixed TinyMCE 'Verify HTML' setting being ignored.
#1079694 by TwoD: Fixed Whizzywig not restoring textarea styles when detached.
#1132142 by tacituseu, TwoD, sun: Fixed nicEdit not removing its submit handler.
#1143104 by EugenMayer: Fixed CKEditor 3.5.4 version detection.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 95c6350..6f6c86f 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -178,7 +178,7 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
$settings['remove_linebreaks'] = $config['remove_linebreaks'];
}
if (isset($config['verify_html'])) {
- $settings['verify_html'] = $config['verify_html'];
+ $settings['verify_html'] = (bool) $config['verify_html'];
}
if (!empty($config['css_classes'])) {