Merge branch 'kk/maint-gitweb-missing-owner'

gitster · gitster · commit 070d5271e464 · 2012-04-29T17:51:56.000-07:00
By Kacper Kornet
* kk/maint-gitweb-missing-owner:
  gitweb: Don't set owner if got empty value from projects.list
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -3012,9 +3012,11 @@ sub git_get_projects_list {
 			}
 			if (check_export_ok("$projectroot/$path")) {
 				my $pr = {
-					path => $path,
-					owner => to_utf8($owner),
+					path => $path
 				};
+				if ($owner) {
+					$pr->{'owner'} = to_utf8($owner);
+				}
 				push @list, $pr;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -3012,9 +3012,11 @@ sub git_get_projects_list {`
`3012`	`3012`	`}`
`3013`	`3013`	`if (check_export_ok("$projectroot/$path")) {`
`3014`	`3014`	`my $pr = {`
`3015`		`- path => $path,`
`3016`		`- owner => to_utf8($owner),`
	`3015`	`+ path => $path`
`3017`	`3016`	`};`
	`3017`	`+ if ($owner) {`
	`3018`	`+ $pr->{'owner'} = to_utf8($owner);`
	`3019`	`+ }`
`3018`	`3020`	`push @list, $pr;`
`3019`	`3021`	`}`
`3020`	`3022`	`}`