From 8814b79bd74d1967fc1d10368b3ae401719ccb80 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 6 Sep 2016 15:20:28 +0100 Subject: [PATCH] Bug 11921: Fix logic in C4::Context->new to init the config Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall --- C4/Context.pm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index 1f1e9a18d2..d6a31bf002 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -246,18 +246,15 @@ sub new { my $conf_cache = Koha::Caches->get_instance('config'); my $config_from_cache; if ( $conf_cache->cache ) { - $config_from_cache = $conf_cache->get_from_cache('koha_conf'); + $self = $conf_cache->get_from_cache('koha_conf'); } - unless ( %$self ) { + unless ( $self and %$self ) { $self = Koha::Config->read_from_file($conf_fname); - } - - if ( $config_from_cache ) { - $self = $config_from_cache; - } elsif ( $conf_cache->memcached_cache ) { - # FIXME it may be better to use the memcached servers from the config file - # to cache it - $conf_cache->set_in_cache('koha_conf', $self) + if ( $conf_cache->memcached_cache ) { + # FIXME it may be better to use the memcached servers from the config file + # to cache it + $conf_cache->set_in_cache('koha_conf', $self) + } } unless ( exists $self->{config} or defined $self->{config} ) { warn "The config file ($conf_fname) has not been parsed correctly"; -- 2.39.5