summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2010-09-10 00:39:32 (GMT)
committer sun2010-09-10 00:39:32 (GMT)
commit7594d9050872e6d5f9a776b7f590f8eda971cb09 (patch)
tree5facd0ee7e32f39ddb49dbbab67a79a14aedcb68
parentd114be7f5e6a42baef021d76a55173b9f011d081 (diff)
#824710 by TwoD: CKEditor not disabled upon enabling.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--wysiwyg.install1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 06c111b..b4c61f2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 5.x-2.x, xxxx-xx-xx
---------------------------
+#824710 by TwoD: CKEditor not disabled upon enabling.
#752516 by nquocbao, sun: Fixed openwysiwyg version callback.
#753536 by TwoD: Fixed version detection for Whizzywig.
#752516 by nquocbao, sun: Fixed file stream warnings in version callbacks.
diff --git a/wysiwyg.install b/wysiwyg.install
index a3cd474..cccc1b3 100644
--- a/wysiwyg.install
+++ b/wysiwyg.install
@@ -41,6 +41,7 @@ function wysiwyg_enable() {
// Disable conflicting, obsolete editor integration modules whenever this
// module is enabled. This is crude, but the only way to ensure no conflicts.
module_disable(array(
+ 'ckeditor',
'editarea',
'editonpro',
'editor',