# 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
* EXreaction/feature/migrations: (48 commits)
[feature/migrations] Remove default values from necessary parameters
[feature/migrations] Revert unrelated changes to functions.php
[ticket/9737] Fix some comments
[ticket/9737] Fix a few minor things in migrations
[feature/migrations] Make sure migration data not done before running data step
[feature/migrations] Function to populate the migrations table (for install)
[feature/migrations] Function effectively_installed() in migrations
[feature/migrations] Make load_migrations recursive (optionally)
[feature/migrations] Make the test depends_on methods static
[feature/migrations] Make depends_on static to call it without dependencies
[feature/migrations] install/database_update_migrations.php
[feature/migrations] Move test.php -> install/database_update_migrations.php
[feature/migrations] Store depends on in the database (serialized)
[feature/migrations] Revert method completed
[feature/migrations] Basic reverting test
[feature/migrations] Test for calling a step multiple times
[feature/migrations] Creating revert method to attempt reverting a migration
[feature/migrations] Some comments in db_tools
[feature/migrations] Reverse data functionality
[feature/migrations] Comment
...
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d
- 9affd6f7e7
which have been merged by d59431691c.
PHPBB3-11201
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11343] Remove spare parentheses.
[ticket/11343] Remove spare space.
[ticket/11343] Use === when checking stored user_actkey against user input.
The needed function phpbb_get_avatar() is defined in
includes/functions_display.php. Include that file in the backwards
compatible function get_user_avatar().
PHPBB3-10018
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11329] Moving colors to colours.css
[ticket/9492] Fix missing phpbb_container in unit tests
[ticket/9492] Fix typo in SQL query
[ticket/9492] Ensure to delete the avatar/rank data when we change it
[ticket/9492] Ensure to update all avatar values when the avatar is changed
[ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
[ticket/9492] Add unit tests for custom ranks and avatars
[ticket/9492] Retain custom ranks and avatars when setting users default group
[ticket/11328] Replace long buttons text with short text
[ticket/11328] Add language variables for buttons
