Missed some Horde_Tree::singleton() conversions

diff --git a/ansel/lib/Widget/OtherGalleries.php b/ansel/lib/Widget/OtherGalleries.php
index 1271f21..7396fcc 100644 (file)
--- a/ansel/lib/Widget/OtherGalleries.php
+++ b/ansel/lib/Widget/OtherGalleries.php
@@ -65,8 +65,7 @@ class Ansel_Widget_OtherGalleries extends Ansel_Widget_Base
         $owner = $this->_view->gallery->get('owner');
 
         /* Set up the tree */
-        $tree = Horde_Tree::singleton('otherAnselGalleries_' . md5($owner), 'Javascript');
-        $tree->setOption(array('class' => 'anselWidgets'));
+        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('otherAnselGalleries_' . md5($owner), 'Javascript', array('class' => 'anselWidgets'));
 
         try {
             $gals = $GLOBALS['injector']->getInstance('Ansel_Storage')

diff --git a/framework/Core/lib/Horde/Core/Perms/Ui.php b/framework/Core/lib/Horde/Core/Perms/Ui.php
index 3e8d9a9..6959a88 100644 (file)
--- a/framework/Core/lib/Horde/Core/Perms/Ui.php
+++ b/framework/Core/lib/Horde/Core/Perms/Ui.php
@@ -76,8 +76,10 @@ class Horde_Core_Perms_Ui
         $blank_img = Horde::img('blank.gif', '', array('width' => 16, 'height' => 16));
 
         /* Set up the tree. */
-        $tree = Horde_Tree::singleton('perms_ui', 'Javascript');
-        $tree->setOption(array('alternate' => true, 'hideHeaders' => true));
+        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('perms_ui', 'Javascript', array(
+            'alternate' => true,
+            'hideHeaders' => true
+        ));
         $tree->setHeader(array(array('width' => '50%')));
 
         foreach ($nodes as $perm_id => $node) {
@@ -85,7 +87,7 @@ class Horde_Core_Perms_Ui
                 ? array('class' => 'selected')
                 : array();
             if ($perm_id == Horde_Perms::ROOT) {
-                $add_link = $add->add('perm_id', $perm_id)->link(array('title' => _("Add New Permission"))) . $add_img . '</a>'; 
+                $add_link = $add->add('perm_id', $perm_id)->link(array('title' => _("Add New Permission"))) . $add_img . '</a>';
                 $base_node_params = $icondir +
                     array('icon' => 'administration.png');
 
@@ -115,7 +117,7 @@ class Horde_Core_Perms_Ui
 
                 if (isset($app_perms['tree']) &&
                     is_array(Horde_Array::getElement($app_perms['tree'], $parents))) {
-                    $add_link = $add->add('perm_id', $perm_id)->link(array('title' => _("Add Child Permission"))) . $add_img . '</a>'; 
+                    $add_link = $add->add('perm_id', $perm_id)->link(array('title' => _("Add Child Permission"))) . $add_img . '</a>';
                     $perms_extra[] = $add_link;
                 } else {
                     $perms_extra[] = $blank_img;

diff --git a/horde/js/hordetree.js b/horde/js/hordetree.js
index 6a9f0e7..984b047 100644 (file)
--- a/horde/js/hordetree.js
+++ b/horde/js/hordetree.js
@@ -7,8 +7,8 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  *
  * @author   Marko Djukic <marko@oblo.com>
+ * @author   Michael Slusarz <slusarz@curecanti.org>
  * @category Horde
- * @package  Horde_Tree
  */
 
 var Horde_Tree = Class.create({

diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php
index 7a9fd81..433c7d7 100644 (file)
--- a/horde/services/portal/sidebar.php
+++ b/horde/services/portal/sidebar.php
@@ -209,7 +209,7 @@ function sidebar()
     global $registry, $conf, $language, $prefs;
 
     // Set up the tree.
-    $tree = Horde_Tree::singleton('horde_menu', 'Javascript');
+    $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('horde_menu', 'Javascript');
     $menu = buildMenu();
     foreach ($menu as $app => $params) {
         if ($params['status'] == 'block') {

diff --git a/news/lib/Categories.php b/news/lib/Categories.php
index 842354e..daf0c9c 100644 (file)
--- a/news/lib/Categories.php
+++ b/news/lib/Categories.php
@@ -477,8 +477,14 @@ class News_Categories {
                         'icon' => 'folder_open.png');
 
         // Set up the tree
-        $tree = Horde_Tree::singleton('news_cats', 'Javascript');
-        $tree->setOption(array('width' => '100%', 'border' => '0', 'class' => 'item', 'cellpadding' => '0', 'cellspacing' => '0', 'alternate' => true));
+        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('news_cats', 'Javascript', array(
+            'alternate' => true,
+            'border' => '0',
+            'cellpadding' => '0',
+            'cellspacing' => '0',
+            'class' => 'item',
+            'width' => '100%'
+        ));
 
         // prepare add link
         if ($have_add_item) {