From d9aa36788dd5f0d95e1f9e1867d8f934d6c7d38a Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 8 Dec 2009 19:45:36 +0100
Subject: [PATCH] Use Horde_Url.

---
 framework/Ui/lib/Horde/Ui/Tabs.php   | 11 +++++------
 framework/Ui/lib/Horde/Ui/Widget.php |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/framework/Ui/lib/Horde/Ui/Tabs.php b/framework/Ui/lib/Horde/Ui/Tabs.php
index 962f6b79e..4af34954a 100644
--- a/framework/Ui/lib/Horde/Ui/Tabs.php
+++ b/framework/Ui/lib/Horde/Ui/Tabs.php
@@ -76,8 +76,7 @@ class Horde_Ui_Tabs extends Horde_Ui_Widget
         foreach ($this->_tabs as $tab) {
             $link = $this->_addPreserved($tab['link']);
             if (!is_null($this->_name) && !is_null($tab['tabname'])) {
-                $link = Horde_Util::addParameter($link, $this->_name,
-                                           $tab['tabname']);
+                $link->add($this->_name, $tab['tabname']);
             }
 
             $class = '';
@@ -101,10 +100,10 @@ class Horde_Ui_Tabs extends Horde_Ui_Widget
 
             $accesskey = Horde::getAccessKey($tab['title']);
 
-            $html .= '<li' . $class . $id . '>' .
-                Horde::link($link, '', '', $tab['target'], $tab['onclick'], null, $accesskey) .
-                Horde::highlightAccessKey(str_replace(' ', '&nbsp;', $tab['title']), $accesskey) .
-                "</a> </li>\n";
+            $html .= '<li' . $class . $id . '>'
+                . $link->link(array('target' => $tab['target'], 'onclick' => $tab['onclick'], 'accesskey' => $accesskey))
+                . Horde::highlightAccessKey(str_replace(' ', '&nbsp;', $tab['title']), $accesskey)
+                . "</a> </li>\n";
         }
 
         return $html . "</ul></div><br class=\"clear\" />\n";
diff --git a/framework/Ui/lib/Horde/Ui/Widget.php b/framework/Ui/lib/Horde/Ui/Widget.php
index ed6739ee0..d8978183b 100644
--- a/framework/Ui/lib/Horde/Ui/Widget.php
+++ b/framework/Ui/lib/Horde/Ui/Widget.php
@@ -99,7 +99,7 @@ abstract class Horde_Ui_Widget
     protected function _addPreserved($link)
     {
         foreach ($this->_preserve as $varName => $varValue) {
-            $link = Horde_Util::addParameter($link, $varName, $varValue);
+            $link->add($varName, $varValue);
         }
 
         return $link;
-- 
2.11.0