From: Jan Schneider <jan@horde.org>
Date: Fri, 15 Oct 2010 12:07:16 +0000 (+0200)
Subject: Use Horde_Url, fixes HTML escaping.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=05c47f9dc66f0997f66eb82379c1756142541751;p=horde.git

Use Horde_Url, fixes HTML escaping.
---

diff --git a/wicked/lib/Text_Wiki/Render/Xhtml/Registrylink.php b/wicked/lib/Text_Wiki/Render/Xhtml/Registrylink.php
index 68ae2ca86..60f1ca49d 100644
--- a/wicked/lib/Text_Wiki/Render/Xhtml/Registrylink.php
+++ b/wicked/lib/Text_Wiki/Render/Xhtml/Registrylink.php
@@ -18,12 +18,13 @@ class Text_Wiki_Render_Xhtml_Registrylink extends Text_Wiki_Render {
      */
     function token($options)
     {
-        $link = $GLOBALS['registry']->link($options['method'], $options['args']);
-        if (is_a($link, 'PEAR_Error')) {
+        try {
+            $link = new Horde_Url($GLOBALS['registry']->link($options['method'], $options['args']));
+        } catch (Horde_Exception $e) {
             return '';
         }
 
-        return Horde::link($link) . $options['title'] . '</a>';
+        return $link->link() . $options['title'] . '</a>';
     }
 
 }