summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWiktor Walc2008-10-20 12:36:25 (GMT)
committer Wiktor Walc2008-10-20 12:36:25 (GMT)
commit03e2253fe7bec5eff4c36c81891e5c13766c3bb9 (patch)
treebc8a8804d53346a4f3c5175b0d643546ddc946da
parent8970f0b359e76476f7aaf7eda3b59aafc3cf0d68 (diff)
#323611 Fixed: recursion detected in /opt/drupal5/includes/common.inc
-rw-r--r--CHANGELOG.txt3
-rw-r--r--fckeditor.module2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ad05629..0f1e152 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
$Id$
+-- 2008-10-20 version 5.x-2.x-dev
+* #323611 Fixed: recursion detected in /opt/drupal5/includes/common.inc
+
-- 2008-10-17 version 5.x-2.x-dev
* #322245 Fixed: appended querystring caused warnings in drupal_get_js
diff --git a/fckeditor.module b/fckeditor.module
index 12355e2..f15b379 100644
--- a/fckeditor.module
+++ b/fckeditor.module
@@ -722,6 +722,7 @@ function fckeditor_process_textarea($element) {
if (!$is_running) {
drupal_add_js($module_drupal_path .'/fckeditor/fckeditor.js');
drupal_add_js($module_drupal_path .'/fckeditor.utils.js');
+ drupal_add_js(array('basePath' => base_path()), 'setting');
$is_running = TRUE;
}
@@ -877,7 +878,6 @@ function fckeditor_process_textarea($element) {
}
drupal_add_js('var '. $js_id .';if (Drupal.jsEnabled) {$(document).ready(function() {'. $js .'});}', 'inline');
- drupal_add_js(array('basePath' => base_path()), 'setting');
if ($conf['popup']=="t") {
// Add the script file with the popup open function.