* 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
* github-bantu/ticket/7262:
[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.
# 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
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11179:
[ticket/11179] remove extra & in function call
[ticket/11179] correct start parameter in sphinx search
[ticket/11179] correct start parameter in native author search
[ticket/11179] correct start parameter in native keyword search
[ticket/11179] fix success query path for postgres
[ticket/11179] fix success query path for mysql
[ticket/11179] minor fixes
[ticket/11179] pass start param by reference in postgres
[ticket/11179] correct start param in author search of postgres
[ticket/11179] correct start parameter in psql keyword search
[ticket/11179] pass start param by reference in author search
[ticket/11179] correct start parameter for author search
[ticket/11179] use FOUND_ROWS query to re-search with changed start param
[ticket/11179] pass start parameter by reference
[ticket/11179] correct the start parameter while retrieving from cache
[ticket/11179] add search query in case initial one fails
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
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11359:
[ticket/11359] html escape sphinx config data
[ticket/11359] add id attribute to textarea
[ticket/11359] close span
