#114575 compatibility with the new 2.4 release of the fckeditor component

#115004 trying a quick and ugly fix for the popup function

diff --git a/fckeditor.config.js b/fckeditor.config.js
index c5bf9e2..371550d 100644 (file)
--- a/fckeditor.config.js
+++ b/fckeditor.config.js
@@ -7,7 +7,7 @@ FCKConfig.ToolbarSets["DrupalFull"] = [
        ['OrderedList','UnorderedList','-','Outdent','Indent'],
        ['JustifyLeft','JustifyCenter','JustifyRight'],
        ['Link','Unlink','Anchor'],
-       ['Image','Flash','Table','Rule','SpecialChar','PageBreak','UniversalKey'],
+       ['Image','Flash','Table','Rule','SpecialChar','PageBreak'],
        '/',
        ['FontFormat'],
        ['TextColor','BGColor']

diff --git a/fckeditor.module b/fckeditor.module
index 26b2899..9aee523 100644 (file)
--- a/fckeditor.module
+++ b/fckeditor.module
@@ -396,7 +396,7 @@ var ".$js_id." = new FCKeditor( '".$element['#id']."' );
        if (variable_get('fckeditor_popup', '0')) {
                // Add the script file with the popup open function.
       drupal_add_js($module_drupal_path . '/fckeditor.popup.js');
-               $element['#title'] .= " <span class=\"fckeditor_popuplink\">(<a href=\"#\" onclick=\"FCKeditor_OpenPopup('".$module_full_path."/fckeditor.popup.html?var=".$js_id."&el=".$element['#id']."');return false;\">" . t('Open rich editor') . "</a>)</span>";
+               $element['#suffix'] .= " <span class=\"fckeditor_popuplink\">(<a href=\"#\" onclick=\"FCKeditor_OpenPopup('".$module_full_path."/fckeditor.popup.html?var=".$js_id."&el=".$element['#id']."');return false;\">" . t('Open rich editor') . "</a>)</span>";
        }
     else {
       // if no popup mode, add the editor
@@ -408,7 +408,7 @@ var ".$js_id." = new FCKeditor( '".$element['#id']."' );
   
   // display the field id for administrators
   if (user_access('administer site configuration')) {
-    $element['#suffix'] .= '<span class="textarea-identifier">The ID for this element is: '.$element['#id'].'</span>';
+    $element['#suffix'] .= '<span class="textarea-identifier">The ID for for excluding or including this element is: '.$element['#id'].' - the path is: '.$_GET['q'].'</span>';
   }
 
   return $element;