Convert xinha -> ckeditor

diff --git a/ansel/img/ecard.php b/ansel/img/ecard.php
index 80714a5..444f25f 100644 (file)
--- a/ansel/img/ecard.php
+++ b/ansel/img/ecard.php
@@ -101,7 +101,7 @@ $form = new Ansel_Form_Ecard($vars, $title);
 $renderer = new Horde_Form_Renderer();
 
 if ($browser->hasFeature('rte')) {
-    $editor = Horde_Editor::factory('xinha', array('id' => 'ecard_comments'));
+    $editor = Horde_Editor::singleton('ckeditor', array('id' => 'ecard_comments'));
     $vars->set('rtemode', 1);
     $form->addHidden('', 'rtemode', 'text', false);
 }

diff --git a/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php b/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php
index c89180f..fa4ee7b 100644 (file)
--- a/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php
+++ b/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php
@@ -156,7 +156,7 @@ class Horde_Form_VarRenderer_Xhtml extends Horde_Form_VarRenderer {
                         htmlspecialchars($var->getValue($vars)));
 
         if ($var->type->hasHelper('rte') && $browser->hasFeature('rte')) {
-            $editor = Horde_Editor::factory('Xinha', array('id' => $var->getVarName()));
+            $editor = Horde_Editor::singleton('ckeditor', array('id' => $var->getVarName()));
         }
 
         if ($var->type->hasHelper() && $browser->hasFeature('javascript')) {

diff --git a/gollem/edit.php b/gollem/edit.php
index a98a7c1..26ea1e8 100644 (file)
--- a/gollem/edit.php
+++ b/gollem/edit.php
@@ -48,7 +48,7 @@ case 'edit_file':
         Horde_Util::closeWindowJS();
     }
     if ($mime_type == 'text/html') {
-        $editor = Horde_Editor::singleton('xinha', array('id' => 'content'));
+        $editor = Horde_Editor::singleton('ckeditor', array('id' => 'content'));
     }
     require GOLLEM_TEMPLATES . '/common-header.inc';
     Gollem::status();