diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:48:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:48:30 -0800 |
commit | 23ad617702e33a8e3c60511f07fe0d152856a39e (patch) | |
tree | 8fcc5fcd34d729ed385273d2f28bbb9a81f7d3be /gitweb/gitweb.perl | |
parent | 378e5e4d9fe3bd339f47a6894ad9a33e7cc3879a (diff) | |
parent | 0e901d24fd70630ffed5411e6217c2dfce9c8da6 (diff) | |
download | git-23ad617702e33a8e3c60511f07fe0d152856a39e.tar.gz git-23ad617702e33a8e3c60511f07fe0d152856a39e.tar.xz |
Merge branch 'os/gitweb-highlight-uncaptured' into maint
"gitweb", when sorting by age to show repositories with new
activities first, used to sort repositories with absolutely nothing
in it early, which was not very useful.
* os/gitweb-highlight-uncaptured:
gitweb: fix error in sanitize when highlight is enabled
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 656b324fb..c6bafe6ea 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1556,7 +1556,7 @@ sub sanitize { return undef unless defined $str; $str = to_utf8($str); - $str =~ s|([[:cntrl:]])|($1 =~ /[\t\n\r]/ ? $1 : quot_cec($1))|eg; + $str =~ s|([[:cntrl:]])|(index("\t\n\r", $1) != -1 ? $1 : quot_cec($1))|eg; return $str; } |