diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ad05629f5f67e04c956721dd6ee9ddc061983168..0f1e152adae8dea0730fa0072fdb4e218fc6e001 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 12355e2f87db05611217c71edc274a554a942b3b..f15b37969a2dea177ae92d0fa0a3fa7359189511 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.