gitweb: Add "\n" after <br/> in git_page_nav

[Gitweb] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 90bfe72f129e1c5bb3c9931d27851689325c288384c43e257906289f2bf6792c..0c508e056d4f1827490c3fb4e89a5c3f8b5d954502cd031559b69f2013772971 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -250,6 +250,7 @@ sub esc_html {
        my $str = shift;
        $str = decode("utf8", $str, Encode::FB_DEFAULT);
        $str = escapeHTML($str);
+       $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
        return $str;
 }
 
@@ -415,7 +416,7 @@ sub git_page_nav {
                                         : $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$_$arg{$_}")}, "$_")
                                 }
                 @navs);
-       print "<br/>$extra<br/>\n" .
+       print "<br/>\n$extra<br/>\n" .
              "</div>\n";
 }
 
@@ -957,7 +958,7 @@ sub git_project_list {
                }
                $alternate ^= 1;
                print "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=summary"), -class => "list"}, esc_html($pr->{'path'})) . "</td>\n" .
-                     "<td>$pr->{'descr'}</td>\n" .
+                     "<td>" . esc_html($pr->{'descr'}) . "</td>\n" .
                      "<td><i>" . chop_str($pr->{'owner'}, 15) . "</i></td>\n";
                print "<td class=\"". age_class($pr->{'commit'}{'age'}) . "\">" . $pr->{'commit'}{'age_string'} . "</td>\n" .
                      "<td class=\"link\">" .