From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Mar 2012 22:45:57 +0000 (-0700)
Subject: Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maint
X-Git-Tag: v1.7.9.4~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f629c233e6dd72924ed2672db142708b71dc663e;p=git.git

Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maint

"gitweb" did use quotemeta() to prepare search string when asked to
do a fixed-string project search, but did not use it by mistake and
used the user-supplied string instead.

By Jakub Narebski
* jn/maint-do-not-match-with-unsanitized-searchtext:
  gitweb: Fix fixed string (non-regexp) project search
---

f629c233e6dd72924ed2672db142708b71dc663e
diff --cc gitweb/gitweb.perl
index 20ace61b6,a7e0d8f68..b9c33ba31
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -5289,9 -5087,9 +5289,9 @@@ sub git_project_list_body 
  
  	my $check_forks = gitweb_check_feature('forks');
  	my $show_ctags  = gitweb_check_feature('ctags');
 -	my $tagfilter = $show_ctags ? $cgi->param('by_tag') : undef;
 +	my $tagfilter = $show_ctags ? $input_params{'ctag'} : undef;
  	$check_forks = undef
- 		if ($tagfilter || $searchtext);
+ 		if ($tagfilter || $search_regexp);
  
  	# filtering out forks before filling info allows to do less work
  	@projects = filter_forks_from_projects_list(\@projects)