Attachment 55314 Details for Bug 11921 – Bug 11921: Fix logic in C4::Context->new to init the config

[patch] Bug 11921: Fix logic in C4::Context->new to init the config

Bug-11921-Fix-logic-in-C4Context-new-to-init-the-c.patch (text/plain), 1.62 KB, created by Tomás Cohen Arazi (tcohen) on 2016-09-07 15:53:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2016-09-07 15:53:09 UTC

Size: 1.62 KB

patch

obsolete

>From 1c3f8bb49b67389151cc136fca1430cfc5b2c30c Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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 <chrisc@catalyst.net.nz>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> C4/Context.pm | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
>diff --git a/C4/Context.pm b/C4/Context.pm
>index 1f1e9a1..d6a31bf 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.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 11921: 54818 | 54819 | 54820 | 55169 | 55170 | 55171 | 55258 | 55259 | 55268 | 55269 | 55270 | 55271 | 55272 | 55310 | 55311 | 55312 | 55313 | 55314 | 55315 | 55441