makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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)
This commit is contained in:
Nils Adermann 2010-03-18 17:06:43 +01:00
commit 49607a0b2c
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -103,6 +103,7 @@
<li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li>
<li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</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] 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> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
</ul> </ul>

14
phpBB/includes/acm/acm_memcache.php
View file

@ -37,6 +37,12 @@ if (!defined('PHPBB_ACM_MEMCACHE_HOST'))
define('PHPBB_ACM_MEMCACHE_HOST', 'localhost'); 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 * ACM for Memcached
* @package acm * @package acm
@ -54,7 +60,11 @@ class acm extends acm_memory
parent::acm_memory(); parent::acm_memory();
$this->memcache = new Memcache; $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; $this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0;
} }
@ -125,4 +135,4 @@ class acm extends acm_memory
} }
} }
?> ?>

4
phpBB/includes/acp/acp_forums.php
View file

@ -407,7 +407,7 @@ class acp_forums
$exclude_forums[] = $row['forum_id']; $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']; $forum_data['forum_password_confirm'] = $forum_data['forum_password'];
} }
@ -416,7 +416,7 @@ class acp_forums
$this->page_title = 'CREATE_FORUM'; $this->page_title = 'CREATE_FORUM';
$forum_id = $this->parent_id; $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 // Fill forum data with default values
if (!$update) if (!$update)