diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 099722c8643be20f8b0bec48ce9d451263b4055f..254e9970f9786a51fe8198b9a59ff869ce086f1a 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 7b9aa1704be1c920e297b246733f13065b3b1195..b531b907f0884de17bd192721ef7ddc257417bec 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) { )) .''; } + $processed_elements[] = $element['#id']; + return $element; }