summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/tinymce.inc2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6a188d3..ed44019 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
+#333521 by sun: Fixed TinyMCE version detection docs.
#327100 by sun: Changed access permission for settings page to 'administer
filters' to prevent incomplete updates.
#322731 by sun: Fixed improper use of t() in module install file.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 2ad6ba1..4a39552 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -79,8 +79,10 @@ function wysiwyg_tinymce_editor() {
* The installed editor version.
*/
function wysiwyg_tinymce_version($editor) {
+ // TinyMCE >= 3 uses changelog.txt.
$changelog = wysiwyg_get_path('tinymce') . '/changelog.txt';
if (!file_exists($changelog)) {
+ // TinyMCE < 3 uses changelog.
$changelog = wysiwyg_get_path('tinymce') . '/changelog';
}
$changelog = fopen($changelog, 'r');