[PATCH v2 2/8] gitweb: Pass esc_html_hl_regions() options to esc_html()
- From
Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
- Date
- Mar 23, 2012, 22:56 UTC
- Message-ID
- <1332543417-19664-3-git-send-email-michal.kiedrowicz@gmail.com>
- In-Reply-To
- <1332543417-19664-1-git-send-email-michal.kiedrowicz@gmail.com>
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.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> ---
Jakub, The code was in fact stolen from a yours patch posted to the list (gitweb: Use esc_html_match_hl() in 'grep' search) that wasn't merged so maybe I should pass the authorship to you?
gitweb/gitweb.perl | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index af645e5..1744c40 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; @@ -1741,14 +1743,14 @@ sub esc_html_hl_regions { # Don't craete empty <span> elements. next if $s->[1] <= $s->[0]; - $out .= esc_html(substr($str, $pos, $s->[0] - $pos)) + $out .= esc_html(substr($str, $pos, $s->[0] - $pos), %opts) if ($s->[0] - $pos > 0); $out .= $cgi->span({-class => $css_class}, - esc_html(substr($str, $s->[0], $s->[1] - $s->[0]))); + esc_html(substr($str, $s->[0], $s->[1] - $s->[0]), %opts)); $pos = $s->[1]; } - $out .= esc_html(substr($str, $pos)) + $out .= esc_html(substr($str, $pos), %opts) if ($pos < length($str)); return $out;
-- 1.7.8.4