From 253213a4b805521bedbb356ab4ad6e1e0a326112 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 30 May 2011 16:19:06 +0800
Subject: Bug 659816: Fix url_decoding of utf8 strings r=mkanat, a=mkanat

---
 Bugzilla/Util.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Bugzilla/Util.pm')

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index ced15491d..4afdef1b4 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -243,14 +243,11 @@ sub xml_quote {
     return $var;
 }
 
-# This function must not be relied upon to return a valid string to pass to
-# the DB or the user in UTF-8 situations. The only thing you  can rely upon
-# it for is that if you url_decode a string, it will url_encode back to the 
-# exact same thing.
 sub url_decode {
     my ($todecode) = (@_);
     $todecode =~ tr/+/ /;       # pluses become spaces
     $todecode =~ s/%([0-9a-fA-F]{2})/pack("c",hex($1))/ge;
+    utf8::decode($todecode) if Bugzilla->params->{'utf8'};
     return $todecode;
 }
 
-- 
cgit v1.2.3-24-g4f1b