gitweb: fix disabling of "forks"
Apparently this code was never tested without "forks".  check-feature
returns a one-element list (0) when disabled, and assigning that to a
scalar variable made it to be called in a scalar context, which meant
my $check_forks = gitweb_check_feature("forks") were always 1!
Signed-off-by: Junio C Hamano <junkio@cox.net>
			
			
				maint
			
			
		
							parent
							
								
									baf0bfcb4b
								
							
						
					
					
						commit
						5dd5ed09fe
					
				|  | @ -926,7 +926,7 @@ sub git_get_projects_list { | ||||||
| 		$dir =~ s!/+$!!; | 		$dir =~ s!/+$!!; | ||||||
| 		my $pfxlen = length("$dir"); | 		my $pfxlen = length("$dir"); | ||||||
|  |  | ||||||
| 		my $check_forks = gitweb_check_feature('forks'); | 		my ($check_forks) = gitweb_check_feature('forks'); | ||||||
|  |  | ||||||
| 		File::Find::find({ | 		File::Find::find({ | ||||||
| 			follow_fast => 1, # follow symbolic links | 			follow_fast => 1, # follow symbolic links | ||||||
|  | @ -2212,7 +2212,7 @@ sub git_patchset_body { | ||||||
| sub git_project_list_body { | sub git_project_list_body { | ||||||
| 	my ($projlist, $order, $from, $to, $extra, $no_header) = @_; | 	my ($projlist, $order, $from, $to, $extra, $no_header) = @_; | ||||||
|  |  | ||||||
| 	my $check_forks = gitweb_check_feature('forks'); | 	my ($check_forks) = gitweb_check_feature('forks'); | ||||||
|  |  | ||||||
| 	my @projects; | 	my @projects; | ||||||
| 	foreach my $pr (@$projlist) { | 	foreach my $pr (@$projlist) { | ||||||
|  | @ -2614,7 +2614,9 @@ sub git_summary { | ||||||
| 	my @taglist  = git_get_tags_list(15); | 	my @taglist  = git_get_tags_list(15); | ||||||
| 	my @headlist = git_get_heads_list(15); | 	my @headlist = git_get_heads_list(15); | ||||||
| 	my @forklist; | 	my @forklist; | ||||||
| 	if (gitweb_check_feature('forks')) { | 	my ($check_forks) = gitweb_check_feature('forks'); | ||||||
|  |  | ||||||
|  | 	if ($check_forks) { | ||||||
| 		@forklist = git_get_projects_list($project); | 		@forklist = git_get_projects_list($project); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano