gitweb: add a "string" variant of print_local_time

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index 3f88ed5fb724af2e41972aeb4d7e827dc1f042680e2188b9e4844e5a278716f7..fee6d6e24ceb4b98df5a2a040fbd8023284603ae942d1109bd7570a4289e8bad 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3255,7 +3255,7 @@ EOF
         print "</head>\n" .
               "<body>\n";
  
         print "</head>\n" .
               "<body>\n";
  
-       if (-f $site_header) {
+       if (defined $site_header && -f $site_header) {
                 insert_file($site_header);
         }
  
                 insert_file($site_header);
         }
  
@@ -3356,7 +3356,7 @@ sub git_footer_html {
                 print "</div>\n"; # class="page_footer"
         }
  
                 print "</div>\n"; # class="page_footer"
         }
  
-       if (-f $site_footer) {
+       if (defined $site_footer && -f $site_footer) {
                 insert_file($site_footer);
         }
  
                 insert_file($site_footer);
         }
  
@@ -3510,14 +3510,21 @@ sub git_print_header_div {
  }
  
  sub print_local_time {
  }
  
  sub print_local_time {
+       print format_local_time(@_);
+}
+
+sub format_local_time {
+       my $localtime = '';
         my %date = @_;
         if ($date{'hour_local'} < 6) {
         my %date = @_;
         if ($date{'hour_local'} < 6) {
-               printf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
+               $localtime .= sprintf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
                         $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
         } else {
                         $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
         } else {
-               printf(" (%02d:%02d %s)",
+               $localtime .= sprintf(" (%02d:%02d %s)",
                         $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
         }
                         $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
         }
+
+       return $localtime;
  }
  
  # Outputs the author name and date in long form
  }
  
  # Outputs the author name and date in long form
@@ -4782,7 +4789,7 @@ sub git_project_list {
         }
  
         git_header_html();
         }
  
         git_header_html();
-       if (-f $home_text) {
+       if (defined $home_text && -f $home_text) {
                 print "<div class=\"index_include\">\n";
                 insert_file($home_text);
                 print "</div>\n";
                 print "<div class=\"index_include\">\n";
                 insert_file($home_text);
                 print "</div>\n";