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>
This commit is contained in:
parent
1149fecfc2
commit
498fe00201
@ -267,7 +267,9 @@ exit;
|
|||||||
## action links
|
## action links
|
||||||
|
|
||||||
sub href(%) {
|
sub href(%) {
|
||||||
my %mapping = (
|
my %params = @_;
|
||||||
|
|
||||||
|
my @mapping = (
|
||||||
action => "a",
|
action => "a",
|
||||||
project => "p",
|
project => "p",
|
||||||
file_name => "f",
|
file_name => "f",
|
||||||
@ -278,18 +280,18 @@ sub href(%) {
|
|||||||
page => "pg",
|
page => "pg",
|
||||||
searchtext => "s",
|
searchtext => "s",
|
||||||
);
|
);
|
||||||
|
my %mapping = @mapping;
|
||||||
|
|
||||||
my %params = @_;
|
|
||||||
$params{"project"} ||= $project;
|
$params{"project"} ||= $project;
|
||||||
|
|
||||||
my $href = "$my_uri?";
|
my @result = ();
|
||||||
$href .= esc_param( join(";",
|
for (my $i = 0; $i < @mapping; $i += 2) {
|
||||||
map {
|
my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
|
||||||
defined $params{$_} ? "$mapping{$_}=$params{$_}" : ()
|
if (defined $params{$name}) {
|
||||||
} keys %params
|
push @result, $symbol . "=" . esc_param($params{$name});
|
||||||
) );
|
}
|
||||||
|
}
|
||||||
return $href;
|
return "$my_uri?" . join(';', @result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user