@matheusbsbs / matheus-bagliano / commits / 7863c612f4
Fork 0

gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form

URLs generated by href(..., -replay=>1) (which includes 'next page' links and alternate view links) didn't set project info correctly when current page URL is in pathinfo form. This resulted in broken links such like: http://www.example.com/w/ARRAY(0x85a5318)?a=shortlog;pg=1 if the 'pathinfo' feature was used, or http://www.example.com/w/?a=shortlog;pg=1 if it wasn't, instead of correct: http://www.example.com/w/project.git?a=shortlog;pg=1 This was caused by the fact that href() always replays params in the arrayref form, were they multivalued or singlevalued, and the code dealing with 'pathinfo' feature couldn't deal with $params{'project'} being arrayref. Setting $params{'project'} is moved before replaying params; this ensures that 'project' parameter is processed correctly. Noticed-by: Peter Oberndorfer <kumbayo84@arcor.de> Noticed-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jakub Narebski committed Feb 14, 2008 at 09:22 UTC 7863c612f402268b5978683f44adad3a7a867613
1 file changed +2 -2
gitweb/gitweb.perl
+2 -2
@@ -611,6 +611,8 @@ sub href(%) {
611 );
612 my %mapping = @mapping;
613
614 + $params{'project'} = $project unless exists $params{'project'};
615 +
616 if ($params{-replay}) {
617 while (my ($name, $symbol) = each %mapping) {
618 if (!exists $params{$name}) {
@@ -620,8 +622,6 @@ sub href(%) {
622 }
623 }
624
623 - $params{'project'} = $project unless exists $params{'project'};
624 -
625 my ($use_pathinfo) = gitweb_check_feature('pathinfo');
626 if ($use_pathinfo) {
627 # use PATH_INFO for project name