summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/whizzywig.inc8
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0208ffa..9778550 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-3.x, xxxx-xx-xx
---------------------------
+#753536 by TwoD: Fixed version detection for Whizzywig.
#752516 by nquocbao, sun: Fixed file stream warnings in version callbacks.
#628110 by quicksketch, sun, markus_petrux: Added editor settings alter hook.
#689218 by wwalc, TwoD, sun: Improved support for CKEditor.
diff --git a/editors/whizzywig.inc b/editors/whizzywig.inc
index 9ad9f6f..14ceaa6 100644
--- a/editors/whizzywig.inc
+++ b/editors/whizzywig.inc
@@ -51,7 +51,9 @@ function wysiwyg_whizzywig_version($editor) {
}
$script = fopen($script, 'r');
$line = fgets($script, 43);
- if (preg_match('@Whizzywig v([0-9]+)@', $line, $version)) {
+ // 55: Whizzywig v55i
+ // 60: Whizzywig 60
+ if (preg_match('@Whizzywig v?([0-9]+)@', $line, $version)) {
fclose($script);
return $version[1];
}
@@ -82,6 +84,10 @@ function wysiwyg_whizzywig_settings($editor, $config, $theme) {
if (file_exists($editor['library path'] . '/WhizzywigToolbar.png')) {
$settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/WhizzywigToolbar.png';
}
+ // Filename changed in version 60.
+ elseif (file_exists($editor['library path'] . '/icons.png')) {
+ $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/icons.png';
+ }
// Add configured buttons or all available.
if (!empty($config['buttons'])) {