From: Galen Charlton <gmcharlt@gmail.com>
Date: Mon, 24 Aug 2009 11:52:46 +0000 (-0400)
Subject: graceful degradation if memcached option is not configured in koha-conf.xml
X-Git-Tag: v3.02.00-alpha~170
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=6b24ddf91c74676ab4adca21b6cf2cc8402f448e;p=koha.git

graceful degradation if memcached option is not configured in koha-conf.xml

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/C4/Languages.pm b/C4/Languages.pm
index 971cc96ef4..ab5761413c 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -26,17 +26,20 @@ use C4::Context;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
 eval {
-    require Memoize::Memcached;
-    import Memoize::Memcached qw(memoize_memcached);
+    my $servers = C4::Context->config('memcached_servers');
+    if ($servers) {
+        require Memoize::Memcached;
+        import Memoize::Memcached qw(memoize_memcached);
  
-    my $memcached = {
-        servers    => [ C4::Context->config('memcached_servers') ],
-        key_prefix => C4::Context->config('memcached_namespace'),
-    };
-
-    memoize_memcached('getTranslatedLanguages', memcached => $memcached, expire_time => 600); #cache for 10 minutes
-    memoize_memcached('getFrameworkLanguages' , memcached => $memcached, expire_time => 600);
-    memoize_memcached('getAllLanguages',        memcached => $memcached, expire_time => 600);
+        my $memcached = {
+            servers    => [ $servers ],
+            key_prefix => C4::Context->config('memcached_namespace') || 'koha',
+        };
+
+        memoize_memcached('getTranslatedLanguages', memcached => $memcached, expire_time => 600); #cache for 10 minutes
+        memoize_memcached('getFrameworkLanguages' , memcached => $memcached, expire_time => 600);
+        memoize_memcached('getAllLanguages',        memcached => $memcached, expire_time => 600);
+    }
 };
 
 BEGIN {