From 18a73c6f927790a6c1b4c9b7cab7334513c63952 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 15 Oct 2010 13:00:09 +0200 Subject: [PATCH] Use Horde_Url, fix double encoding. --- wicked/lib/Page.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/wicked/lib/Page.php b/wicked/lib/Page.php index be925d006..cc8c42174 100644 --- a/wicked/lib/Page.php +++ b/wicked/lib/Page.php @@ -413,13 +413,9 @@ class Wicked_Page { global $wicked, $conf; - $view_url = Horde_Util::addParameter(Wicked::url('%s', false, -1), 'referrer', $this->pageName(), false); - /* Attach the session parameter manually, because we don't want the - * parameters to be encoded, but don't want full URLs either. */ - if (empty($GLOBALS['conf']['session']['use_only_cookies']) && - !isset($_COOKIE[session_name()])) { - $view_url = Horde_Util::addParameter($view_url, session_name(), session_id(), false); - } + $view_url = Wicked::url('%s') + ->setRaw(true) + ->add('referrer', $this->pageName()); $view_url = str_replace(array(urlencode('%s'), urlencode('/')), array('%s', '%' . urlencode('/')), $view_url); /* Make sure we have a valid wiki format */ -- 2.11.0