1 files changed, 6 insertions, 0 deletions

diff --git a/buglist.cgi b/buglist.cgi
index a498d09f1..d0f350e0a 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -253,6 +253,12 @@ sub LookupNamedQuery {
                                                 WHERE userid = ? AND name = ?
                                                       $extra",
                                                undef, @args);
+
+    # Some DBs (read: Oracle) incorrectly mark this string as UTF-8
+    # even though it has no UTF-8 characters in it, which prevents
+    # Bugzilla::CGI from later reading it correctly.
+    utf8::downgrade($result) if utf8::is_utf8($result);
+
     if (!defined($result)) {
         return 0 unless $throw_error;
         ThrowUserError("missing_query", {'queryname' => $name,