зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
ea14e6c554
Коммит
7863c612f4
|
@ -611,6 +611,8 @@ sub href(%) {
|
||||||
);
|
);
|
||||||
my %mapping = @mapping;
|
my %mapping = @mapping;
|
||||||
|
|
||||||
|
$params{'project'} = $project unless exists $params{'project'};
|
||||||
|
|
||||||
if ($params{-replay}) {
|
if ($params{-replay}) {
|
||||||
while (my ($name, $symbol) = each %mapping) {
|
while (my ($name, $symbol) = each %mapping) {
|
||||||
if (!exists $params{$name}) {
|
if (!exists $params{$name}) {
|
||||||
|
@ -620,8 +622,6 @@ sub href(%) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$params{'project'} = $project unless exists $params{'project'};
|
|
||||||
|
|
||||||
my ($use_pathinfo) = gitweb_check_feature('pathinfo');
|
my ($use_pathinfo) = gitweb_check_feature('pathinfo');
|
||||||
if ($use_pathinfo) {
|
if ($use_pathinfo) {
|
||||||
# use PATH_INFO for project name
|
# use PATH_INFO for project name
|
||||||
|
|
Загрузка…
Ссылка в новой задаче