gitweb: make search form generate pathinfo-style URLs

The search form generated traditional-style URLs with a "p=" parameter
even when the pathinfo feature was on.  This patch makes it generate
pathinfo-style URLs when appropriate.

Signed-off-by: Matt McCutchen <hashproduct@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matt McCutchen 2007-06-28 14:57:07 -04:00 committed by Junio C Hamano
parent 76e4f5d025
commit 40375a83d2

View File

@ -2213,12 +2213,18 @@ EOF
} else { } else {
$search_hash = "HEAD"; $search_hash = "HEAD";
} }
my $action = $my_uri;
my ($use_pathinfo) = gitweb_check_feature('pathinfo');
if ($use_pathinfo) {
$action .= "/$project";
} else {
$cgi->param("p", $project);
}
$cgi->param("a", "search"); $cgi->param("a", "search");
$cgi->param("h", $search_hash); $cgi->param("h", $search_hash);
$cgi->param("p", $project); print $cgi->startform(-method => "get", -action => $action) .
print $cgi->startform(-method => "get", -action => $my_uri) .
"<div class=\"search\">\n" . "<div class=\"search\">\n" .
$cgi->hidden(-name => "p") . "\n" . (!$use_pathinfo && $cgi->hidden(-name => "p") . "\n") .
$cgi->hidden(-name => "a") . "\n" . $cgi->hidden(-name => "a") . "\n" .
$cgi->hidden(-name => "h") . "\n" . $cgi->hidden(-name => "h") . "\n" .
$cgi->popup_menu(-name => 'st', -default => 'commit', $cgi->popup_menu(-name => 'st', -default => 'commit',