* 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)
* feature/arstechnica/memcache-multi-server:
[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
You can define multiple memcache servers in your config using this format:
host::port,host::port,host::port
Example:
@define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
The feature branch for the new template engine should probably
contain all the deleted tests as well. We should look into the
incompatibilities and try to stay backwards compatible.
Git supports several hooks, some of which are client-side. The
prepare-commit-msg hook is run right after a `git commit` call, before
the editor is opened. This allows the initial message to be altered.
This hook will check if the current branch name begins with `bug/`, in
which case it will prepend `[$branchname]` to the commit message. This
makes it easier to create proper commit messages.
http://wiki.phpbb.com/Git#Commit_Messages
For more information refer to the hook source.
This issue affects any forum (i.e. https://myforum/phpBB3/) where:
- the forum is located in a directory underneath the web root (i.e., NOT https://myforum/)
- a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php)
- the URI used ends in a slash (i.e., NOT https://myforum/phpBB3)
If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=).
This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=)
Moved the MIN(smiley_order) to the SELECT column list now, so it can be
used for sorting on MySQL 4, but also still works on MSSQL, which the
bug was originally about.
