* develop-olympus:
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
Conflicts:
phpBB/includes/acp/acp_groups.php
In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.
PHPBB3-11355
* develop-olympus:
[ticket/7262] Add note about set_config() not updating is_dynamic.
[ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
[ticket/7262] Backport set_config() and set_config_count() docs from develop.
Conflicts:
phpBB/includes/functions.php
# By Nathaniel Guse (6) and Nathan Guse (3)
# Via Nathan Guse (1) and Nathaniel Guse (1)
* EXreaction/feature/migrations-extensions:
[feature/migrations] Use getLocalisedMessage() function to get error message
[feature/migrations] Fix failing tests (again)
[feature/migrations] Fix failing tests
[feature/migrations] Catch and display errors from the migrator
[feature/migrations] Call revert correctly when purging an extension
[feature/migrations] Inject Migrator instead of using the container to fetch
[feature/migrations] Fix path to extension migrations
[feature/migrations] Automatically install/revert migrations for extensions
[feature/migrations] Make the container available to extension installers
# By Nathaniel Guse (4) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11351:
[feature/migrations] getLocalisedMessage function for migration exception
[feature/migrations] Fix unfulfillable function
[feature/migrations] getParameters function for migration exception
[feature/migrations] Add explanatory language string for migration errors
[feature/migrations] Add language strings for migrations errors
The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array
which results in an E_NOTICE being thrown for 'Array to string conversion' on
PHP 5.4.
Ensure that the array passed to strtr() is one-dimensional by filtering out
non-string values.
PHPBB3-11361
start parameter is passed by reference so that in case it is not in bounds
the changes made to it are reflected back to the phpBB/search.php file
PHPBB3-11179
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
Migrations from ext/ext_name/migrations/ are automatically installed
when enabling the extension and automatically reverted when the
extension is purged.
PHPBB3-11318
