From 4b7216045311ad2944e792c695c529a9132397b6 Mon Sep 17 00:00:00 2001
From: Jamie Snape <jamie.snape@kitware.com>
Date: Thu, 26 Jun 2014 14:43:19 -0400
Subject: [PATCH] Tweak memcache initialization

---
 core/GlobalController.php                   | 4 ++--
 library/Zend/Cache/Backend/Libmemcached.php | 2 +-
 library/Zend/Cache/Backend/Memcached.php    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/GlobalController.php b/core/GlobalController.php
index 0e43542ad..b27b7960a 100644
--- a/core/GlobalController.php
+++ b/core/GlobalController.php
@@ -117,7 +117,7 @@ public function preDispatch()
     if(!$this->isDebug())
       {
       $frontendOptions = array('automatic_serialization' => true, 'lifetime' => 86400);
-      if(extension_loaded('memcache'))
+      if(extension_loaded('memcache') || session_save_path() === 'Memcache')
         {
         $cache = Zend_Cache::factory('Core', 'Memcached', $frontendOptions, array());
         }
@@ -128,7 +128,7 @@ public function preDispatch()
       else
         {
         $cacheDir = UtilityComponent::getCacheDirectory() . '/db';
-        if(is_writable($cacheDir))
+        if(is_dir($cacheDir) && is_writable($cacheDir))
           {
           $backendOptions = array('cache_dir' => $cacheDir);
           $cache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions);
diff --git a/library/Zend/Cache/Backend/Libmemcached.php b/library/Zend/Cache/Backend/Libmemcached.php
index f1cdca1b3..fbc746172 100644
--- a/library/Zend/Cache/Backend/Libmemcached.php
+++ b/library/Zend/Cache/Backend/Libmemcached.php
@@ -96,7 +96,7 @@ class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend
      */
     public function __construct(array $options = array())
     {
-        if (!extension_loaded('memcached')) {
+        if (!extension_loaded('memcached') || session_save_path() !== 'Memcache') {
             Zend_Cache::throwException('The memcached extension must be loaded for using this backend !');
         }
 
diff --git a/library/Zend/Cache/Backend/Memcached.php b/library/Zend/Cache/Backend/Memcached.php
index 223f6a493..68f872666 100644
--- a/library/Zend/Cache/Backend/Memcached.php
+++ b/library/Zend/Cache/Backend/Memcached.php
@@ -119,7 +119,7 @@ class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Ca
      */
     public function __construct(array $options = array())
     {
-        if (!extension_loaded('memcache')) {
+        if (!extension_loaded('memcache') || session_save_path() !== 'Memcache') {
             Zend_Cache::throwException('The memcache extension must be loaded for using this backend !');
         }
         parent::__construct($options);