From 05c47f9dc66f0997f66eb82379c1756142541751 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 15 Oct 2010 14:07:16 +0200 Subject: [PATCH] Use Horde_Url, fixes HTML escaping. --- wicked/lib/Text_Wiki/Render/Xhtml/Registrylink.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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'] . ''; + return $link->link() . $options['title'] . ''; } } -- 2.11.0