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>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 43b1600486c4c71c5004e42f918381110fec5224..50083e3011d145a25c7c56d85d75dd04ef15adf3 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -267,7 +267,9 @@ sub feature_snapshot {
 ## action links
 
 sub href(%) {
 ## action links
 
 sub href(%) {

-       my %mapping = (
+       my %params = @_;
+
+       my @mapping = (

                action => "a",
                project => "p",
                file_name => "f",
                action => "a",
                project => "p",
                file_name => "f",


@@ -278,18 +280,18 @@ (%)
                page => "pg",
                searchtext => "s",
        );
                page => "pg",
                searchtext => "s",
        );

+       my %mapping = @mapping;

 
 

-       my %params = @_;

        $params{"project"} ||= $project;
 
        $params{"project"} ||= $project;
 

-       my $href = "$my_uri?";
-       $href .= esc_param( join(";",
-               map {
-                       defined $params{$_} ? "$mapping{$_}=$params{$_}" : ()
-               } keys %params
-       ) );
-
-       return $href;
+       my @result = ();
+       for (my $i = 0; $i < @mapping; $i += 2) {
+               my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
+               if (defined $params{$name}) {
+                       push @result, $symbol . "=" . esc_param($params{$name});
+               }
+       }
+       return "$my_uri?" . join(';', @result);

 }
 
 
 }