X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FCGI.pm;h=b8607c933781104bb4f70d3502460374b2b0ce7f;hp=94986cba7a3c0860982ec3fce14b3f8a8daa5d26;hb=8d29452530e823cbcd07a30898e98abe565a046c;hpb=ab47ae363dddbc35743572c62fae6350dcb7cf96;ds=sidebyside

diff --git a/lib/Packages/CGI.pm b/lib/Packages/CGI.pm
index 94986cb..b8607c9 100644
--- a/lib/Packages/CGI.pm
+++ b/lib/Packages/CGI.pm
@@ -416,13 +416,15 @@ sub make_url {
 	$val = $override->{$p} if exists $override->{$p};
 	push @query_string, "$p=$val" if $val;
     }
-    push @path, $add_path if $add_path;
+    push @path, $add_path if $add_path and $add_path ne '/';
     push @query_string, $add_query if $add_query;
 
     my $path = join( '/', @path );
     my $query_string = join( '&', @query_string );
+    $path .= '/' if $add_path and $add_path eq '/';
+    $path .= "?$query_string" if $query_string;
 
-    return "$path?$query_string";
+    return $path;
 }
 
 sub make_search_url {