X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/1c065aeeb084074bbebc0b5465f3cb4733c9aae370fb70f290c341ca32d78bdc..d7f282a727c1543f204775243adb5e7a9444f220c96ddeb132847f95b79a1b26:/gitweb.perl?ds=sidebyside

diff --git a/gitweb.perl b/gitweb.perl
index 91663a4..0d86a7f 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1733,7 +1733,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;
@@ -1744,15 +1746,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;