From da0347e9af601ec04d8f5095775ab538bd2ead6b Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Mon, 21 Mar 2016 17:12:55 -0400
Subject: Bug 1251208 - Bugzilla->request_cache() can be faster r=dkl,a=dylan

without breaking stuff this time.
---
 Bugzilla/Install/Util.pm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 90ef2d4e3..3ec185c2b 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -651,15 +651,8 @@ sub prevent_windows_dialog_boxes {
 
 # This is like request_cache, but it's used only by installation code
 # for checksetup.pl and things like that.
-our $_cache = {};
-sub _cache {
-    # If the normal request_cache is available (which happens any time
-    # after the requirements phase) then we should use that.
-    if (eval { Bugzilla->request_cache; }) {
-        return Bugzilla->request_cache;
-    }
-    return $_cache;
-}
+my $_cache = {};
+sub _cache { return $_cache; }
 
 ###############################
 # Copied from Bugzilla::Util #
-- 
cgit v1.2.3-24-g4f1b