kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gitweb: Convert string to internal form before chopping in chop_str 

Fix chop_str not to cut in middle of utf8 multibyte chars. Without
this fix at least author name in short log may cut in middle of a
multibyte char. When the result comes to esc_html to_utf8 is called
again, which doesn't find valid utf8 and decodes using
$fallback_encoding making it even worse.

This also have the nice side effect that it actually tries to show the
first 10 _characters_, not the number of characters that happened to fit
into 10 bytes.

Signed-off-by: Anders Waldenborg <anders@0x63.nu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Anders Waldenborg 2008-05-21 13:44:43 +02:00 committed by Junio C Hamano
parent 1af8bca797
commit dee2775a29
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitweb/gitweb.perl
View File

@ -866,6 +866,10 @@ sub chop_str {
my $add_len = shift || 10; my $add_len = shift || 10;
my $where = shift || 'right'; # 'left' | 'center' | 'right' my $where = shift || 'right'; # 'left' | 'center' | 'right'


# Make sure perl knows it is utf8 encoded so we don't
# cut in the middle of a utf8 multibyte char.
$str = to_utf8($str);

# allow only $len chars, but don't cut a word if it would fit in $add_len # allow only $len chars, but don't cut a word if it would fit in $add_len
# if it doesn't fit, cut it if it's still longer than the dots we would add # if it doesn't fit, cut it if it's still longer than the dots we would add
# remove chopped character entities entirely # remove chopped character entities entirely