From 971508f613585488ce9ec65dd26f4fee31424295 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Wed, 3 Sep 2014 17:49:55 -0600
Subject: [PATCH] Removed memcache from auto setup, added memcache server
 config, removed memcached support

---
 system/src/Grav/Common/Cache.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 9c2de6886..2fa6c7f79 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -90,8 +90,6 @@ class Cache extends Getters
                 $driver_name = 'wincache';
             } elseif (extension_loaded('xcache')) {
                 $driver_name = 'xcache';
-            } elseif (extension_loaded('memcache')) {
-                $driver_name = 'memcache';
             }
         } else {
             $driver_name = $setting;
@@ -111,11 +109,11 @@ class Cache extends Getters
                 break;
 
             case 'memcache':
+                $memcache = new \Memcache();
+                $memcache->connect($this->config->get('system.cache.memcache.server','localhost'),
+                                   $this->config->get('system.cache.memcache.port', 11211));
                 $driver = new \Doctrine\Common\Cache\MemcacheCache();
-                break;
-
-            case 'memcached':
-                $driver = new \Doctrine\Common\Cache\MemcachedCache();
+                $driver->setMemcache($memcache);
                 break;
 
             default: