From 1e762fa5d00732bfdfb51fd8b3e56879f17d8f6e Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 23 Nov 2016 11:41:44 -0500
Subject: Bug 1319503 - Backport request_cache optimizations from upstream

---
 Bugzilla/Install/Util.pm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'Bugzilla/Install')

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 231ef8efc..c65c0e061 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -699,15 +699,7 @@ 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;
-}
+use constant _cache => {};
 
 ###############################
 # Copied from Bugzilla::Util #
-- 
cgit v1.2.3-24-g4f1b