* commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5':
[ticket/9872] Removed some useless code that broke delete_posts
These changes have already been applied in an earlier commit.
Therefore this commit is empty. Merge was done using 'ours' strategy.
user_delete now uses fewer queries to delete a set of users of size > 1 by
accepting an array of users rather than a single user at a time. This required
changing the third parameter, however the function retains its former behavior
with the old-style parameters.
PHPBB3-9622
Since knowledge base instructions tell users to place this script
in the root of the forum, use './' as phpbb root path. Actual
initialization code copied from check_flash_bbcodes.php.
PHPBB3-10058
The order of the Approve / Disapprove buttons was inconsistent in the
Moderator Control Panel - while on the main page and the moderation
queue itself the Approve button was to the right of the Disapprove
button, in the post details the Approve button was to the left of the
Disapprove button.
This very simple edit simply switches the position of these two buttons
in the post details page in the mcp.
PHPBB3-9995
When in the ACP, there is the option to delete a user and all their
posts. This would then call the user_delete function and define $mode as
'remove'.
On lines 485-521 was some code that would delete their topics, then
after that there would be a call to delete_posts - which would also
delete their topics. It would not update the board statistics, and the
thread count would remain the same, even though several had been
deleted. It stopped delete_topics functioning correctly, so
delete_topics would not update the board statistics either.
My solution to this is to delete lines 485-521 and allow delete_posts
to call delete_topics, thus updating the thread count in the statistics.
PHPBB3-9872
* develop-olympus:
[ticket/10056] Corrected a typo in Firebird name.
[ticket/10041] Use send_status_line more in download/file.php
Conflicts:
phpBB/download/file.php
* develop-olympus:
[ticket/7778] Update all the schema files
[ticket/7778] Add the column change to `mysql_upgrader.php`
[ticket/7778] BBCode single limit
Conflicts:
phpBB/install/database_update.php
* ticket/erikfrerejean/7778:
[ticket/7778] Update all the schema files
[ticket/7778] Add the column change to `mysql_upgrader.php`
[ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.
Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes
PHPBB3-7778
* develop-olympus:
[ticket/10052] Add comments to the session testable factory.
[ticket/10052] Correct session tests, and separate session factory from tests
* ticket/naderman/10052:
[ticket/10052] Add comments to the session testable factory.
[ticket/10052] Correct session tests, and separate session factory from tests
* develop-olympus:
[ticket/9675] Correctly check whether the style/component is still in use.
[ticket/9675] Put the code into methods to avoid code duplication.
[ticket/9675] Adjust the language-string to reflect the changes.
[ticket/9675] Add option to delete template/theme/imageset when deleting style.
* ticket/nickvergessen/9675:
[ticket/9675] Correctly check whether the style/component is still in use.
[ticket/9675] Put the code into methods to avoid code duplication.
[ticket/9675] Adjust the language-string to reflect the changes.
[ticket/9675] Add option to delete template/theme/imageset when deleting style.
* develop-olympus:
[ticket/10049] Mark session init test incomplete for now.
[ticket/10049] Mark session continue test incomplete for now.
[ticket/10049] Globalize $_SID.
[ticket/10049] Chase assertResultEquals rename.
[ticket/10049] Fixed requires in session tests and mock.
[ticket/10049] Renamed session test files to proper file names.
* ticket/p/10049:
[ticket/10049] Mark session init test incomplete for now.
[ticket/10049] Mark session continue test incomplete for now.
[ticket/10049] Globalize $_SID.
[ticket/10049] Chase assertResultEquals rename.
[ticket/10049] Fixed requires in session tests and mock.
[ticket/10049] Renamed session test files to proper file names.
cd694e9b9d renamed
assertResultEquals to assertSqlResultEquals. However, since the
session tests were never executed calls in them were never
updated.
Parameter order also changed; chase that too.
PHPBB3-10049
* develop-olympus:
[ticket/9944] Add empty line before the while() so you can better read the code
[ticket/9944] Extension groups naming don't use users' language in ACP
Conflicts:
phpBB/install/database_update.php
* ticket/nickvergessen/9944:
[ticket/9944] Add empty line before the while() so you can better read the code
[ticket/9944] Extension groups naming don't use users' language in ACP
* develop-olympus:
[ticket/10044] Updated invocation documentation.
[ticket/10044] Stop when failed to retrieve network/collaborators.
[ticket/10044] Added -h to setup_github_network.php.
[ticket/10044] Error handling for remote requests in setup_github_network.php
[ticket/10044] Made setup_github_network.php runnable as a script
* ticket/p/10044:
[ticket/10044] Updated invocation documentation.
[ticket/10044] Stop when failed to retrieve network/collaborators.
[ticket/10044] Added -h to setup_github_network.php.
[ticket/10044] Error handling for remote requests in setup_github_network.php
[ticket/10044] Made setup_github_network.php runnable as a script
* ticket/nickvergessen/10045:
[ticket/10045] Update version in some more files.
[ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)
PHPBB3-10045
* develop-olympus:
[task/refactor-db-testcase] Further improve error messages.
[task/refactor-db-testcase] Do not show db password on connect error
[task/refactor-db-testcase] Improve error message of db tests
[task/refactor-db-testcase] Refactor phpbb_database_test_case
