From: Michał Kiedrowicz Date: Wed, 11 Apr 2012 21:18:39 GMT Subject: [PATCH v4 3/8] gitweb: Pass esc_html_hl_regions() options to esc_html() Message-ID: <1334179124-14258-4-git-send-email-michal.kiedrowicz@gmail.com> In-Reply-To: <1334179124-14258-1-git-send-email-michal.kiedrowicz@gmail.com> From: Jakub Narębski 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 Signed-off-by: Michał Kiedrowicz --- gitweb/gitweb.perl | 11 +++++++---- 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 { # 'foobar' 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 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; -- 1.7.8.4