aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/cache/driver/memcached.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-06-25 10:32:39 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-06-25 10:32:39 +0200
commit774c79c631b4356d000910cd25041cd10dd9ce2c (patch)
treeaea7d42f46ab057a518276ee22a4e19fd3d826aa /phpBB/phpbb/cache/driver/memcached.php
parente45ba1d2796b41a74f7c84f1510518ffd67a3cab (diff)
parentea8334b693220c202a811b6c8ee1786c222d160e (diff)
downloadforums-774c79c631b4356d000910cd25041cd10dd9ce2c.tar
forums-774c79c631b4356d000910cd25041cd10dd9ce2c.tar.gz
forums-774c79c631b4356d000910cd25041cd10dd9ce2c.tar.bz2
forums-774c79c631b4356d000910cd25041cd10dd9ce2c.tar.xz
forums-774c79c631b4356d000910cd25041cd10dd9ce2c.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/cache/driver/memcached.php')
-rw-r--r--phpBB/phpbb/cache/driver/memcached.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/cache/driver/memcached.php b/phpBB/phpbb/cache/driver/memcached.php
index 105e763af4..a7da22d7e8 100644
--- a/phpBB/phpbb/cache/driver/memcached.php
+++ b/phpBB/phpbb/cache/driver/memcached.php
@@ -67,8 +67,8 @@ class memcached extends \phpbb\cache\driver\memory
foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u)
{
- $parts = explode('/', $u);
- $this->memcached->addServer(trim($parts[0]), trim($parts[1]));
+ preg_match('#(.*)/(\d+)#', $u, $parts);
+ $this->memcache->addServer(trim($parts[1]), (int) trim($parts[2]));
}
}