summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-03-28 23:19:26 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-03-28 23:19:26 +0200
commitb32a0b4336a3182df4896ca207f3f30c264b0061 (patch)
tree1b4c4ac552634a81e219752ee21bfa61e2b64fc9 /Bugzilla
parente8f93b1e5dd4a7242fd504b4a1160bc1e24a71da (diff)
downloadbugzilla-b32a0b4336a3182df4896ca207f3f30c264b0061.tar.gz
bugzilla-b32a0b4336a3182df4896ca207f3f30c264b0061.tar.xz
Bug 550765: Unicode strings from install_string were showing up as garbage
when used in the web interface r=LpSolit, a=LpSolit
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/Util.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 233e08e19..6621a7a41 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -265,6 +265,8 @@ sub install_string {
die "No language defines the string '$string_id'"
if !defined $string_template;
+ utf8::decode($string_template) if !utf8::is_utf8($string_template);
+
$vars ||= {};
my @replace_keys = keys %$vars;
foreach my $key (@replace_keys) {
@@ -281,7 +283,7 @@ sub install_string {
}
$string_template =~ s/\Q##$key##\E/$replacement/g;
}
-
+
return $string_template;
}