summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWiktor Walc2008-11-06 13:56:30 (GMT)
committer Wiktor Walc2008-11-06 13:56:30 (GMT)
commitbf37825fae0f0b427d1849ae1f3b8d361469aaf4 (patch)
tree570296909d4ca4588f37256964b7d35ae4f9603e
parentdc8f5dab76a36e578fdcfb538e50de669a6ae167 (diff)
#327490 Fixed: duplicate FCKeditor in Panels
-rw-r--r--CHANGELOG.txt3
-rw-r--r--fckeditor.module8
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 099722c..254e997 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
$Id$
+-- 2008-11-06 version 5.x-2.x-dev
+* #327490 Fixed: duplicate FCKeditor in Panels
+
-- 2008-10-21 version 5.x-2.x-dev
* #314319 Added protection against XSS attacks when editing
diff --git a/fckeditor.module b/fckeditor.module
index 7b9aa17..b531b90 100644
--- a/fckeditor.module
+++ b/fckeditor.module
@@ -800,7 +800,13 @@ function fckeditor_is_enabled($excl_mode, $excl_fields, $excl_paths, $element_id
function fckeditor_process_textarea($element) {
static $is_running = FALSE;
static $num = 1;
+ static $processed_elements = array();
global $user, $fckeditor_simple_toolbar_ids, $fckeditor_configuration, $fckeditor_js_ids;
+
+ $processed = in_array($element['#id'], $processed_elements);
+ if ($processed) {
+ return $element;
+ }
//hack for module developers that want to disable FCKeditor on their textareas
if (key_exists('#wysiwyg', $element) && !$element['#wysiwyg']) {
@@ -1105,6 +1111,8 @@ function fckeditor_process_textarea($element) {
)) .'</div>';
}
+ $processed_elements[] = $element['#id'];
+
return $element;
}