summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2009-03-20 23:55:51 (GMT)
committer sun2009-03-20 23:55:51 (GMT)
commita75d0927550e9d9f3f73d4f7f6fbea0ad82c0dca (patch)
tree346bc8a1467b15ca7e0fda492b30e05617d7c94c
parente37449740997d603aea5dff7a580cdc4b75ccefc (diff)
#398848 by sun: Added support for TinyMCE 3.1.
-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 667ea2e..84b7f34 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
---------------------------
+#398848 by sun: Added support for TinyMCE 3.1.
#394068 by StephaneC: markItUp: Fixed icons not displayed due to #385736.
#385974 by sun: Fixed form element description for CSS path (for Define CSS).
#390460 by sun: Fixed broken plugin loading due to #359626.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index edd749e..ab356f9 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -47,7 +47,7 @@ function wysiwyg_tinymce_editor() {
'css files' => array('tinymce-2.css'),
'download url' => 'http://sourceforge.net/project/showfiles.php?group_id=103281&package_id=111430&release_id=557383',
),
- '3.2' => array(
+ '3.1' => array(
// 'include files' => array('tinymce-3.inc'),
'js files' => array('tinymce-3.js'),
'css files' => array('tinymce-3.css'),