Use Horde_Editor from horde-git

diff --git a/framework/Form/lib/Horde/Form/VarRenderer/Xhtml.php b/framework/Form/lib/Horde/Form/VarRenderer/Xhtml.php
index b5ba306..312a217 100644 (file)
--- a/framework/Form/lib/Horde/Form/VarRenderer/Xhtml.php
+++ b/framework/Form/lib/Horde/Form/VarRenderer/Xhtml.php
@@ -299,7 +299,7 @@ if (tmp) {
                         htmlspecialchars($var->getValue($vars)));
 
         if ($var->type->hasHelper('rte') && $browser->hasFeature('rte')) {
-            $editor = Horde_Editor::factory('xinha', array('id' => $var->getVarName()));
+            $editor = Horde_Editor::factory('Xinha', array('id' => $var->getVarName()));
         }
 
         if ($var->type->hasHelper() && $browser->hasFeature('javascript')) {

diff --git a/imp/lib/UI/Compose.php b/imp/lib/UI/Compose.php
index ebf42ef..cbf5562 100644 (file)
--- a/imp/lib/UI/Compose.php
+++ b/imp/lib/UI/Compose.php
@@ -190,7 +190,7 @@ class IMP_UI_Compose
      */
     function initRTE($mode = 'imp')
     {
-        $editor = &Horde_Editor::singleton('fckeditor', array('id' => 'message', 'no_notify' => true));
+        $editor = &Horde_Editor::singleton('Fckeditor', array('id' => 'message', 'no_notify' => true));
 
         $fck_buttons = $GLOBALS['prefs']->getValue('fckeditor_buttons');
         if (!empty($fck_buttons)) {

diff --git a/imp/stationery.php b/imp/stationery.php
index 58694ac..06516fb 100644 (file)
--- a/imp/stationery.php
+++ b/imp/stationery.php
@@ -91,7 +91,7 @@ if ($updated) {
 }
 
 if ($stationery['t'] == 'html') {
-    $editor = &Horde_Editor::singleton('fckeditor', array('id' => 'content'));
+    $editor = &Horde_Editor::singleton('Fckeditor', array('id' => 'content'));
 }
 
 /* Show the header. */

diff --git a/news/add.php b/news/add.php
index 73919ee..bc1539f 100644 (file)
--- a/news/add.php
+++ b/news/add.php
@@ -110,6 +110,7 @@ foreach ($conf['attributes']['languages'] as $key) {
         $form->addVariable($flag . _("Tags"), "tags_$key", 'text', false, false, _("Enter one or more keywords that describe your news. Separate them by spaces."));
     }
     $form->addVariable($flag . _("Content"), "content_$key", 'longtext', ($key == $default_lang) ? true : false , false, false, array(20, 120));
+    // TODO: tinymce is no longer available
     Horde_Editor::singleton('tinymce',
         array('id' => "content_$key",
               'config' => array('mode'=> 'exact',