diff options
| author | Michał Kiedrowicz <michal.kiedrowicz@gmail.com> | 2012-04-11 23:18:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-11 14:26:01 -0700 |
| commit | cbbea3dfc1a1cfe382e58488c389471b4ab21876 (patch) | |
| tree | 04c43a3a2606fad78f9f26423a9a4a19117d9a48 /gitweb | |
| parent | ce61fb968f9b86f5d889eeb7b80da8ec3d6bfb9b (diff) | |
| download | git-cbbea3dfc1a1cfe382e58488c389471b4ab21876.tar.gz | |
gitweb: esc_html_hl_regions(): Don't create empty <span> elements
If $end is equal to or less than $begin, esc_html_hl_regions()
generates an empty <span> element. It normally shouldn't be visible in
the web browser, but it doesn't look good when looking at page source.
It also minimally increases generated page size for no special reason.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Acked-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1c54301582..588b87d234 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1740,6 +1740,9 @@ sub esc_html_hl_regions { for my $s (@sel) { my ($begin, $end) = @$s; + # Don't create empty <span> elements. + next if $end <= $begin; + my $escaped = esc_html(substr($str, $begin, $end - $begin)); $out .= esc_html(substr($str, $pos, $begin - $pos)) |