* [PATCH] gitweb: Call to_utf8() on input string in chop_and_escape_str()
@ 2011-11-29 21:41 Jürgen Kreileder
2011-11-29 21:50 ` Jakub Narebski
0 siblings, 1 reply; 3+ messages in thread
From: Jürgen Kreileder @ 2011-11-29 21:41 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
a) To fix the comparison with the chopped string
b) To give the title attribute correct encoding
Signed-off-by: Jürgen Kreileder <jk@blackdown.de>
---
gitweb/gitweb.perl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 4f0c3bd..4237ea6 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1695,11 +1695,11 @@ sub chop_and_escape_str {
my ($str) = @_;
my $chopped = chop_str(@_);
- if ($chopped eq $str) {
+ if ($chopped eq to_utf8($str)) {
return esc_html($chopped);
} else {
$str =~ s/[[:cntrl:]]/?/g;
- return $cgi->span({-title=>$str}, esc_html($chopped));
+ return $cgi->span({-title => to_utf8($str)}, esc_html($chopped));
}
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gitweb: Call to_utf8() on input string in chop_and_escape_str()
2011-11-29 21:41 [PATCH] gitweb: Call to_utf8() on input string in chop_and_escape_str() Jürgen Kreileder
@ 2011-11-29 21:50 ` Jakub Narebski
2011-11-29 22:14 ` Jürgen Kreileder
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Narebski @ 2011-11-29 21:50 UTC (permalink / raw)
To: Jürgen Kreileder; +Cc: git
Jürgen Kreileder wrote:
> a) To fix the comparison with the chopped string
> b) To give the title attribute correct encoding
>
> Signed-off-by: Jürgen Kreileder <jk@blackdown.de>
> ---
> gitweb/gitweb.perl | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 4f0c3bd..4237ea6 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -1695,11 +1695,11 @@ sub chop_and_escape_str {
> my ($str) = @_;
Why not simply
my $str = to_utf8(shift);
> my $chopped = chop_str(@_);
> - if ($chopped eq $str) {
> + if ($chopped eq to_utf8($str)) {
> return esc_html($chopped);
> } else {
> $str =~ s/[[:cntrl:]]/?/g;
> - return $cgi->span({-title=>$str}, esc_html($chopped));
> + return $cgi->span({-title => to_utf8($str)}, esc_html($chopped));
> }
> }
>
> --
> 1.7.5.4
>
--
Jakub Narebski
Poland
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] gitweb: Call to_utf8() on input string in chop_and_escape_str()
2011-11-29 21:50 ` Jakub Narebski
@ 2011-11-29 22:14 ` Jürgen Kreileder
0 siblings, 0 replies; 3+ messages in thread
From: Jürgen Kreileder @ 2011-11-29 22:14 UTC (permalink / raw)
To: Jakub Narebski, git
On Tue, Nov 29, 2011 at 22:50, Jakub Narebski <jnareb@gmail.com> wrote:
> Jürgen Kreileder wrote:
>
>> a) To fix the comparison with the chopped string
>> b) To give the title attribute correct encoding
>>
>> Signed-off-by: Jürgen Kreileder <jk@blackdown.de>
>> ---
>> gitweb/gitweb.perl | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
>> index 4f0c3bd..4237ea6 100755
>> --- a/gitweb/gitweb.perl
>> +++ b/gitweb/gitweb.perl
>> @@ -1695,11 +1695,11 @@ sub chop_and_escape_str {
>> my ($str) = @_;
>
> Why not simply
>
> my $str = to_utf8(shift);
>
Good question. Because I thought it broke something when I tested it.
I can't reproduce that now, though. Might have been something unrelated.
So:
-- >8 --
Subject: [PATCH] gitweb: Call to_utf8() on input string in
chop_and_escape_str()
a) To fix the comparison with the chopped string
b) To give the title attribute correct encoding
Signed-off-by: Jürgen Kreileder <jk@blackdown.de>
---
gitweb/gitweb.perl | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index bfada0e..036ae46 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1699,6 +1699,7 @@ sub chop_and_escape_str {
my ($str) = @_;
my $chopped = chop_str(@_);
+ $str = to_utf8($str);
if ($chopped eq $str) {
return esc_html($chopped);
} else {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-29 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-29 21:41 [PATCH] gitweb: Call to_utf8() on input string in chop_and_escape_str() Jürgen Kreileder
2011-11-29 21:50 ` Jakub Narebski
2011-11-29 22:14 ` Jürgen Kreileder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).