From 07c842de0faa0cb33206f374b78d5b8a75c58604 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 15 Mar 2016 09:38:20 +0000
Subject: [PATCH] Bug 16068: Do not cache overridden prefs

These prefs do not need to be cached, a quick access to $ENV permit to
get the value.

Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6e8d24231c03775422f403a76ca41ccf22f40558)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 C4/Context.pm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/C4/Context.pm b/C4/Context.pm
index 3747f3a974..07bdf33cbf 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -516,6 +516,9 @@ sub preference {
 
     $var = lc $var;
 
+    return $ENV{"OVERRIDE_SYSPREF_$var"}
+        if defined $ENV{"OVERRIDE_SYSPREF_$var"};
+
     # Return the value if the var has already been accessed
     if ($use_syspref_cache && exists $syspref_L1_cache{$var}) {
         return $syspref_L1_cache{$var};
@@ -526,14 +529,9 @@ sub preference {
         : undef;
     return $cached_var if defined $cached_var;
 
-    my $value;
-    if ( defined $ENV{"OVERRIDE_SYSPREF_$var"} ) {
-        $value = $ENV{"OVERRIDE_SYSPREF_$var"};
-    } else {
-        my $syspref;
-        eval { $syspref = Koha::Config::SysPrefs->find( lc $var ) };
-        $value = $syspref ? $syspref->value() : undef;
-    }
+    my $syspref;
+    eval { $syspref = Koha::Config::SysPrefs->find( lc $var ) };
+    my $value = $syspref ? $syspref->value() : undef;
 
     if ( $use_syspref_cache ) {
         $syspref_cache->set_in_cache("syspref_$var", $value);
-- 
2.39.5