mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 19:26:53 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander
2017-06-25 10:32:39 +02:00
parent e45ba1d279 ea8334b693
commit 774c79c631
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/cache/driver/memcache.php vendored
View File

@ -52,8 +52,8 @@ class memcache extends \phpbb\cache\driver\memory
$this->memcache = new \Memcache; $this->memcache = new \Memcache;
foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u) foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u)
{ {
$parts = explode('/', $u); preg_match('#(.*)/(\d+)#', $u, $parts);
$this->memcache->addServer(trim($parts[0]), trim($parts[1])); $this->memcache->addServer(trim($parts[1]), (int) trim($parts[2]));
} }
$this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0; $this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0;
} }

4
phpBB/phpbb/cache/driver/memcached.php vendored
View File

@ -67,8 +67,8 @@ class memcached extends \phpbb\cache\driver\memory
foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u) foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u)
{ {
$parts = explode('/', $u); preg_match('#(.*)/(\d+)#', $u, $parts);
$this->memcached->addServer(trim($parts[0]), trim($parts[1])); $this->memcache->addServer(trim($parts[1]), (int) trim($parts[2]));
} }
} }