diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 10:32:39 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 10:32:39 +0200 |
| commit | 774c79c631b4356d000910cd25041cd10dd9ce2c (patch) | |
| tree | aea7d42f46ab057a518276ee22a4e19fd3d826aa /phpBB/phpbb | |
| parent | e45ba1d2796b41a74f7c84f1510518ffd67a3cab (diff) | |
| parent | ea8334b693220c202a811b6c8ee1786c222d160e (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/phpbb/cache/driver/memcache.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/cache/driver/memcached.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php index caa82fb0b1..57f138f574 100644 --- a/phpBB/phpbb/cache/driver/memcache.php +++ b/phpBB/phpbb/cache/driver/memcache.php @@ -52,8 +52,8 @@ class memcache extends \phpbb\cache\driver\memory $this->memcache = new \Memcache; foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u) { - $parts = explode('/', $u); - $this->memcache->addServer(trim($parts[0]), trim($parts[1])); + preg_match('#(.*)/(\d+)#', $u, $parts); + $this->memcache->addServer(trim($parts[1]), (int) trim($parts[2])); } $this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0; } 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])); } } |