summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Narębski <jnareb@gmail.com>2012-04-11 21:18:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-11 21:26:01 (GMT)
commit9768a9d884ee293548c0435df7645fd82d8d942e (patch)
tree713dc6140179a0c096fb226de2b0c9c23d970a25
parentcbbea3dfc1a1cfe382e58488c389471b4ab21876 (diff)
downloadgit-9768a9d884ee293548c0435df7645fd82d8d942e.zip
git-9768a9d884ee293548c0435df7645fd82d8d942e.tar.gz
git-9768a9d884ee293548c0435df7645fd82d8d942e.tar.bz2
gitweb: Pass esc_html_hl_regions() options to esc_html()
With this change, esc_html_hl_regions() accepts options and passes them down to esc_html(). This may be needed if a caller wants to pass -nbsp=>1 to esc_html(). The idea and implementation example of this change was described in 337da8d2 (gitweb: Introduce esc_html_match_hl and esc_html_hl_regions, 2012-02-27). While other suggestions may be more useful in some cases, there is no need to implement them at the moment. The esc_html_hl_regions() interface may be changed later if it's needed. [mk: extracted from larger patch and wrote commit message] Signed-off-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgitweb/gitweb.perl11
1 files changed, 7 insertions, 4 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 588b87d..db1f698 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1732,7 +1732,9 @@ sub chop_and_escape_str {
# '<span class="mark">foo</span>bar'
sub esc_html_hl_regions {
my ($str, $css_class, @sel) = @_;
- return esc_html($str) unless @sel;
+ my %opts = grep { ref($_) ne 'ARRAY' } @sel;
+ @sel = grep { ref($_) eq 'ARRAY' } @sel;
+ return esc_html($str, %opts) unless @sel;
my $out = '';
my $pos = 0;
@@ -1743,15 +1745,16 @@ sub esc_html_hl_regions {
# Don't create empty <span> elements.
next if $end <= $begin;
- my $escaped = esc_html(substr($str, $begin, $end - $begin));
+ my $escaped = esc_html(substr($str, $begin, $end - $begin),
+ %opts);
- $out .= esc_html(substr($str, $pos, $begin - $pos))
+ $out .= esc_html(substr($str, $pos, $begin - $pos), %opts)
if ($begin - $pos > 0);
$out .= $cgi->span({-class => $css_class}, $escaped);
$pos = $end;
}
- $out .= esc_html(substr($str, $pos))
+ $out .= esc_html(substr($str, $pos), %opts)
if ($pos < length($str));
return $out;