@matheusbsbs / matheus-bagliano / commits / 498fe00201
Fork 0

gitweb: Sort CGI parameters returned by href()

Restore pre-1c2a4f5addce479c619057c6cdc841802139982f ordering of CGI parameters. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Aug 22, 2006 at 19:05 UTC 498fe00201401b766a200cf423a8ec42b5d5643e
1 file changed +12 -10
gitweb/gitweb.perl
+12 -10
@@ -267,7 +267,9 @@ exit;
267 ## action links
268
269 sub href(%) {
270 - my %mapping = (
270 + my %params = @_;
271 +
272 + my @mapping = (
273 action => "a",
274 project => "p",
275 file_name => "f",
@@ -278,18 +280,18 @@ sub href(%) {
280 page => "pg",
281 searchtext => "s",
282 );
283 + my %mapping = @mapping;
284
282 - my %params = @_;
285 $params{"project"} ||= $project;
286
285 - my $href = "$my_uri?";
286 - $href .= esc_param( join(";",
287 - map {
288 - defined $params{$_} ? "$mapping{$_}=$params{$_}" : ()
289 - } keys %params
290 - ) );
291 -
292 - return $href;
287 + my @result = ();
288 + for (my $i = 0; $i < @mapping; $i += 2) {
289 + my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
290 + if (defined $params{$name}) {
291 + push @result, $symbol . "=" . esc_param($params{$name});
292 + }
293 + }
294 + return "$my_uri?" . join(';', @result);
295 }
296
297