From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Mar 2012 21:04:49 +0000 (-0800)
Subject: Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext'
X-Git-Tag: v1.7.10-rc1~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa145bf6f1cb45ad66250c40da3cd708956cf71e;p=git.git

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

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

Conflicts:
	gitweb/gitweb.perl
---

aa145bf6f1cb45ad66250c40da3cd708956cf71e
diff --cc gitweb/gitweb.perl
index cd98888a9,a7e0d8f68..a8b5fad26
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -3073,15 -2905,11 +3073,15 @@@ sub filter_forks_from_projects_list 
  sub search_projects_list {
  	my ($projlist, %opts) = @_;
  	my $tagfilter  = $opts{'tagfilter'};
- 	my $searchtext = $opts{'searchtext'};
+ 	my $search_re = $opts{'search_regexp'};
  
  	return @$projlist
- 		unless ($tagfilter || $searchtext);
+ 		unless ($tagfilter || $search_re);
  
 +	# searching projects require filling to be run before it;
 +	fill_project_list_info($projlist,
 +	                       $tagfilter  ? 'ctags' : (),
- 	                       $searchtext ? ('path', 'descr') : ());
++	                       $search_re ? ('path', 'descr') : ());
  	my @projects;
   PROJECT:
  	foreach my $pr (@$projlist) {
@@@ -5482,20 -5087,19 +5482,20 @@@ 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)
  		if ($check_forks);
 -	@projects = fill_project_list_info(\@projects);
 -	# searching projects require filling to be run before it
 +	# search_projects_list pre-fills required info
  	@projects = search_projects_list(\@projects,
- 	                                 'searchtext' => $searchtext,
+ 	                                 'search_regexp' => $search_regexp,
  	                                 'tagfilter'  => $tagfilter)
- 		if ($tagfilter || $searchtext);
+ 		if ($tagfilter || $search_regexp);
 +	# fill the rest
 +	@projects = fill_project_list_info(\@projects);
  
  	$order ||= $default_projects_order;
  	$from = 0 unless defined $from;