Bug 645427: Bugzilla->usage_mode( USAGE_MODE_BROWSER ) doesn't change Bugzilla->usage...

r/a=LpSolit

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 8928ff8b08c9f5e2bd0b7fd398446f582b25b567..621222e8ae1b521db9f3f239cdddb02ce76b683b 100644 (file)
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -485,8 +485,14 @@ sub usage_mode {
         }
         $class->request_cache->{usage_mode} = $newval;
     }
-    return $class->request_cache->{usage_mode}
-        || (i_am_cgi()? USAGE_MODE_BROWSER : USAGE_MODE_CMDLINE);
+
+    # XXX - Once we require Perl 5.10.1, this test can be replaced by //.
+    if (exists $class->request_cache->{usage_mode}) {
+        return $class->request_cache->{usage_mode};
+    }
+    else {
+        return (i_am_cgi()? USAGE_MODE_BROWSER : USAGE_MODE_CMDLINE);
+    }
 }
 
 sub installation_mode {