Commit 4e015d03 authored by Jeremy's avatar Jeremy

Revert "Issue #2376391 by Jeremy, marco: Call to undefined function lock_acquire()"

This reverts commit 05a9903c.
parent 05a9903c
...@@ -637,14 +637,14 @@ function dmemcache_extension() { ...@@ -637,14 +637,14 @@ function dmemcache_extension() {
if ($extension === NULL) { if ($extension === NULL) {
// If an extension is specified in settings.php, use that when available. // If an extension is specified in settings.php, use that when available.
$preferred = variable_get('memcache_extension', NULL); $preferred = variable_get('memcache_extension', NULL);
if (isset($preferred) && class_exists($preferred, FALSE)) { if (isset($preferred) && class_exists($preferred)) {
$extension = ucfirst(strtolower($preferred)); $extension = ucfirst(strtolower($preferred));
} }
// If no extension is set, default to Memcache. // If no extension is set, default to Memcache.
elseif (class_exists('Memcache', FALSE)) { elseif (class_exists('Memcache')) {
$extension = 'Memcache'; $extension = 'Memcache';
} }
elseif (class_exists('Memcached', FALSE)) { elseif (class_exists('Memcached')) {
$extension = 'Memcached'; $extension = 'Memcached';
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment