From f6a1e00828de5ab23166c73e081b17824d3eb88a Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 6 Sep 2010 21:12:07 -0600 Subject: [PATCH] Bug #9224: Don't output two slashes in a row --- framework/Core/lib/Horde.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index 17c7cc39a..5a0b4a2bb 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -960,8 +960,8 @@ HTML; if (isset($puri['path']) && $puri['path'][0] == '/') { $url .= $puri['path']; } else { - $webroot = $GLOBALS['registry']->get('webroot', empty($opts['app']) ? null : $opts['app']); - $url .= '/' . ltrim($webroot, '/') . '/' . (isset($puri['path']) ? $puri['path'] : ''); + $webroot = ltrim($GLOBALS['registry']->get('webroot', empty($opts['app']) ? null : $opts['app']), '/'); + $url .= '/' . ($webroot ? $webroot . '/' : '') . (isset($puri['path']) ? $puri['path'] : ''); } if (isset($puri['query'])) { -- 2.11.0