diff --git a/composer-dist.json b/composer-dist.json index c58f08e11..c914d1c32 100644 --- a/composer-dist.json +++ b/composer-dist.json @@ -50,7 +50,8 @@ "seeddms/preview": "dev-master", "seeddms/sqlitefts": "dev-master", "seeddms/http_webdav_server": "dev-master", - "wikimedia/composer-merge-plugin": "dev-master" + "wikimedia/composer-merge-plugin": "dev-master", + "cache/memcached-adapter": "^1.2" }, "require-dev": { "composer/composer": "dev-main" diff --git a/composer.json b/composer.json index e39a55b09..196257a4f 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,8 @@ "seeddms/preview": "dev-master", "seeddms/sqlitefts": "dev-master", "seeddms/http_webdav_server": "dev-master", - "wikimedia/composer-merge-plugin": "dev-master" + "wikimedia/composer-merge-plugin": "dev-master", + "cache/memcached-adapter": "^1.2" }, "require-dev": { "composer/composer": "dev-main", diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php index 72c70f15d..6434b55f2 100644 --- a/inc/inc.DBInit.php +++ b/inc/inc.DBInit.php @@ -58,11 +58,12 @@ $dms = new SeedDMS_Core_DMS($db, $storage ? $storage : $settings->_contentDir.$s $memcache = null; if($settings->_enableMemcached && extension_loaded('memcached')) { - $memcache = new Memcached('seeddms'); - $memcache->addServers(array( + $mc = new Memcached('seeddms'); + $mc->addServers(array( array($settings->_memcachedHost ?? 'localhost', $settings->_memcachedPort ?? 11211), )); - $dms->setMemcache($memcache); + $memcache = new \Cache\Adapter\Memcached\MemcachedCachePool($mc); + $dms->setCache($memcache); } if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {