From 7aafea317901cf41c128b50dc46e8252fab4cf8e Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 28 Jul 2009 23:27:17 -0600 Subject: [PATCH] Fix URL generation in getServiceLink() --- framework/Core/lib/Horde.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index 4ce257cfa..5f7b08173 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -423,10 +423,11 @@ HTML; self::addScriptFile('popup.js', 'horde', true); } $url = self::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true); - return Horde_Util::addParameter($url, 'module', $app); + return Horde_Util::addParameter($url, array('module' => $app)); case 'problem': - return self::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(self::selfUrl(true, true, true))); + $url = self::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php'); + return Horde_Util::addParameter($url, array('return_url' => urlencode(self::selfUrl(true, true, true)))); case 'logout': return Horde_Auth::getLogoutUrl(array('reason' => Horde_Auth::REASON_LOGOUT)); @@ -435,9 +436,9 @@ HTML; return self::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'); case 'options': - global $conf; - if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) { - return self::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app); + if (!in_array($GLOBALS['conf']['prefs']['driver'], array('', 'none'))) { + $url = self::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php'); + return Horde_Util::addParameter($url, array('app' => $app)); } break; } -- 2.11.0