diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:06:43 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:06:43 +0100 |
| commit | 49607a0b2c134355abe924fccc06df07a985edef (patch) | |
| tree | ad5df1fe4deb38f25c24cab8e0e513b73eebd94e | |
| parent | d1e8f6a0d30f2d64b9fa78e76d447e884293f239 (diff) | |
| parent | da5c36fdeb15a23af426895b11a58051c7ee6997 (diff) | |
| download | forums-49607a0b2c134355abe924fccc06df07a985edef.tar forums-49607a0b2c134355abe924fccc06df07a985edef.tar.gz forums-49607a0b2c134355abe924fccc06df07a985edef.tar.bz2 forums-49607a0b2c134355abe924fccc06df07a985edef.tar.xz forums-49607a0b2c134355abe924fccc06df07a985edef.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
[feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
Allow setting parent forums regardless of permission settings. (Bug #58415)
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_memcache.php | 14 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7b8d8f63f2..e5dcd82806 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -103,6 +103,7 @@ <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li> <li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li> + <li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> </ul> diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php index 52b8832749..e54fa36c38 100644 --- a/phpBB/includes/acm/acm_memcache.php +++ b/phpBB/includes/acm/acm_memcache.php @@ -37,6 +37,12 @@ if (!defined('PHPBB_ACM_MEMCACHE_HOST')) define('PHPBB_ACM_MEMCACHE_HOST', 'localhost'); } +if (!defined('PHPBB_ACM_MEMCACHE')) +{ + //can define multiple servers with host1/port1,host2/port2 format + define('PHPBB_ACM_MEMCACHE', PHPBB_ACM_MEMCACHE_HOST . '/' . PHPBB_ACM_MEMCACHE_PORT); +} + /** * ACM for Memcached * @package acm @@ -54,7 +60,11 @@ class acm extends acm_memory parent::acm_memory(); $this->memcache = new Memcache; - $this->memcache->connect(PHPBB_ACM_MEMCACHE_HOST, PHPBB_ACM_MEMCACHE_PORT); + foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u) + { + $parts = explode('/', $u); + $this->memcache->addServer(trim($parts[0]), trim($parts[1])); + } $this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0; } @@ -125,4 +135,4 @@ class acm extends acm_memory } } -?>
\ No newline at end of file +?> diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index bde59ec870..5a5adc57ae 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -407,7 +407,7 @@ class acp_forums $exclude_forums[] = $row['forum_id']; } - $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, false, false, false); + $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, true, false, false); $forum_data['forum_password_confirm'] = $forum_data['forum_password']; } @@ -416,7 +416,7 @@ class acp_forums $this->page_title = 'CREATE_FORUM'; $forum_id = $this->parent_id; - $parents_list = make_forum_select($this->parent_id, false, false, false, false); + $parents_list = make_forum_select($this->parent_id, false, true, false, false); // Fill forum data with default values if (!$update) |