summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2008-12-05 00:40:05 (GMT)
committersun2008-12-05 00:40:05 (GMT)
commitf012ff6dc7443ab48ee8907fee80082394ecd26a (patch)
treec9ccc76a1a863307b536208c412130a0bafc0798
parent7214cd0a93c77103b3f1eb9f3c31a1673942eacd (diff)
#341267 by sun: Fixed improper test for internal editor plugins.
-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 bcf0f5b..61af320 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
---------------------------
+#341267 by sun: Fixed improper test for internal editor plugins.
#341996 by sun: Fixed editor cannot be re-enabled with one input format only.
#341267 by sun: Added support for extensions that do not need to be loaded.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 1355701..df69f72 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -307,7 +307,7 @@ function wysiwyg_tinymce_themes($editor, $profile) {
function wysiwyg_tinymce_plugin_settings($editor, $profile, $plugins) {
$settings = array();
foreach ($plugins as $name => $plugin) {
- if (!isset($plugin['internal'])) {
+ if (empty($plugin['internal'])) {
$settings[$name] = base_path() . $plugin['path'];
}
}