diff --git a/flextype/Cache.php b/flextype/Cache.php index b1ff2b48..124111cf 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -121,8 +121,6 @@ class Cache if (!$driver_name || $driver_name == 'auto') { if (extension_loaded('apcu')) { $driver_name = 'apcu'; - } elseif (extension_loaded('apc')) { - $driver_name = 'apc'; } elseif (extension_loaded('wincache')) { $driver_name = 'wincache'; } elseif (extension_loaded('xcache')) { @@ -133,11 +131,6 @@ class Cache } switch ($driver_name) { - // The ApcCache driver uses the apc_fetch, apc_exists, etc. functions - // that come with PHP so no additional setup is required in order to use it. - case 'apc': - $driver = new DoctrineCache\ApcCache(); - break; // The ApcuCache driver uses the apcu_fetch, apcu_exists, etc. functions // that come with PHP so no additional setup is required in order to use it. case 'apcu': @@ -159,16 +152,6 @@ class Cache case 'xcache': $driver = new DoctrineCache\XcacheCache(); break; - // The MemcacheCache drivers stores the cache data in Memcache. - case 'memcache': - $memcache = new \Memcache(); - $memcache->connect( - Registry::get('settings.cache.memcache.server', 'localhost'), - Registry::get('settings.cache.memcache.port', 11211) - ); - $driver = new DoctrineCache\MemcacheCache(); - $driver->setMemcache($memcache); - break; // The MemcachedCache drivers stores the cache data in Memcached. case 'memcached': $memcached = new \Memcached(); diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 1e64edf8..3e128f14 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -86,11 +86,9 @@ class SettingsManager $cache_driver = ['auto' => 'Auto Detect', 'file' => 'File', - 'apc' => 'APC', 'apcu' => 'APCu', 'wincache' => 'WinCache', 'xcache' => 'Xcache', - 'memcache' => 'Memcache', 'memcached' => 'Memcached', 'redis' => 'Redis', 'sqlite3' => 'SQLite3', diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php index 5aa0c2a4..592da4b4 100644 --- a/site/plugins/admin/views/templates/system/settings/list.php +++ b/site/plugins/admin/views/templates/system/settings/list.php @@ -196,16 +196,6 @@ Themes::view('admin/views/partials/content-start')->display(); = Form::input('cache[lifetime]', $settings['cache']['lifetime'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheLifetime', 'required']) ?> -