From: Koosha Khajeh Moogahi <koosha.khajeh@gmail.com>
Date: Tue, 24 Apr 2012 21:21:22 +0000 (+0200)
Subject: Bug 645433: Bugzilla->error_mode( ERROR_MODE_WEBPAGE ) doesn't change Bugzilla->error... 
X-Git-Tag: bugzilla-4.3.2~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41beb175fdeffa2ac3598a714ac3acb985ba86a4;p=thirdparty%2Fbugzilla.git

Bug 645433: Bugzilla->error_mode( ERROR_MODE_WEBPAGE ) doesn't change Bugzilla->error_mode
r/a=LpSolit
---

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 621222e8ae..ccd3840674 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -445,8 +445,14 @@ sub error_mode {
     if (defined $newval) {
         $class->request_cache->{error_mode} = $newval;
     }
-    return $class->request_cache->{error_mode}
-        || (i_am_cgi() ? ERROR_MODE_WEBPAGE : ERROR_MODE_DIE);
+
+    # XXX - Once we require Perl 5.10.1, this test can be replaced by //.
+    if (exists $class->request_cache->{error_mode}) {
+        return $class->request_cache->{error_mode};
+    }
+    else {
+        return (i_am_cgi() ? ERROR_MODE_WEBPAGE : ERROR_MODE_DIE);
+    }
 }
 
 # This is used only by Bugzilla::Error to throw errors.