Bug 645433: Bugzilla->error_mode( ERROR_MODE_WEBPAGE ) doesn't change Bugzilla->error...

r/a=LpSolit

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 621222e8ae1b521db9f3f239cdddb02ce76b683b..ccd38406740471e3dcd66cce46b575a6311dccd0 100644 (file)
--- 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.