* develop-ascraeus:
[ticket/12456] Add , after the last array element
[ticket/12456] Fix duplicated empty lines in language files
[ticket/12456] Fix missing new lines at the end of email templates
[ticket/12456] Missing new lines at the end of file in language files
* nickvergessen/ticket/12456:
[ticket/12456] Add , after the last array element
[ticket/12456] Fix duplicated empty lines in language files
[ticket/12456] Fix missing new lines at the end of email templates
[ticket/12097] Validate_data() should work with class method
* Nicofuma/ticket/12097:
[ticket/12097] Bug fix and adding unit test
[ticket/12097] Validate_data() should work with class method
Currently 13 functions are marked as deprecated:
functions.php:
function set_var()
function request_var()
function set_config()
function set_config_count()
function tz_select()
function add_log()
functions_admin:
function cache_moderators()
function update_foes()
functions_compatibility:
function get_user_avatar()
function phpbb_hash()
function phpbb_check_hash()
function phpbb_clean_path()
functions_install:
function get_tables()
8 of them are still used in the core:
add_log Used in many places (~198 calls)
get_tables Used in install\install_convert::get_convert_settings
and functions_install.php\connect_check_db
get_user_avatar Used in phpbb\user_loader:get_avatar
phpbb_hash Used in phpbb\db\migration\data\v30x\release_3_0_5_rc1
request_var Used quite everywhere (~997 calls)
set_config Used in many places (~129 calls)
set_config_count Used in a few places (~37 calls)
set_var Used by phpbb_http_login
and phpbb\auth\provider\apache::autologin
PHPBB3-12199
* develop-ascraeus:
[ticket/12012] Move property to the top
[ticket/12012] Move MS SQL server comparison into a method
[ticket/12012] Fix docs in connection manager
[ticket/12012] Remove duplicated code (only the $sql are different)
[ticket/12012] Handle begin and commit transactions in tests
[ticket/12012] Drop and recreate indexes when removing columns
[ticket/12012] Add a unit test for removing a column with indexes
[ticket/12012] Add a unit test for changing the column type
[ticket/12012] Return SQL statements for index drop/create
[ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
[ticket/12012] Drop and recreate indexes when changing a column on MSSQL
[ticket/12012] Fix query layout
[ticket/12012] Correctly drop default value constraints on MSSQL
[ticket/12012] Correctly drop default value constraints
* nickvergessen/ticket/12012:
[ticket/12012] Move property to the top
[ticket/12012] Move MS SQL server comparison into a method
[ticket/12012] Fix docs in connection manager
[ticket/12012] Remove duplicated code (only the $sql are different)
[ticket/12012] Handle begin and commit transactions in tests
[ticket/12012] Drop and recreate indexes when removing columns
[ticket/12012] Add a unit test for removing a column with indexes
[ticket/12012] Add a unit test for changing the column type
[ticket/12012] Return SQL statements for index drop/create
[ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
[ticket/12012] Drop and recreate indexes when changing a column on MSSQL
[ticket/12012] Fix query layout
[ticket/12012] Correctly drop default value constraints on MSSQL
* develop-ascraeus:
[ticket/12382] Mark broken nested loop with include as incomplete
[ticket/12382] Add template test for subloops inside includes
[ticket/12382] Add template test for subloops inside events
* nickvergessen/ticket/12382:
[ticket/12382] Mark broken nested loop with include as incomplete
[ticket/12382] Add template test for subloops inside includes
[ticket/12382] Add template test for subloops inside events
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-d...
* bantu/ticket/12436:
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
* develop-ascraeus:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
* github-nickvergessen/ticket/11917:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
Conflicts:
phpBB/install/install_install.php
* develop-ascraeus:
[ticket/12201] Decreased pagination font size.
[ticket/12201] Update select element to follow same design as prosilver.
[ticket/12201] Increase sort font size just slightly.
[ticket/12201] Add link to resync file stats after error.
[ticket/12201] Fix typos in language pack.
[ticket/12201] Display error and sorting options when there are no attachments
[ticket/12201] Only the top pagination should be floated to the right.
[ticket/12201] Rearrange pagination, sorting, and submit elements.
[ticket/12201] Center the file size and mark columns.
[ticket/12201] Separate pagination from table.
[ticket/12201] Clean up ACP attachment management page
* prototech/ticket/12201:
[ticket/12201] Decreased pagination font size.
[ticket/12201] Update select element to follow same design as prosilver.
[ticket/12201] Increase sort font size just slightly.
[ticket/12201] Add link to resync file stats after error.
[ticket/12201] Fix typos in language pack.
[ticket/12201] Display error and sorting options when there are no attachments
[ticket/12201] Only the top pagination should be floated to the right.
[ticket/12201] Rearrange pagination, sorting, and submit elements.
[ticket/12201] Center the file size and mark columns.
[ticket/12201] Separate pagination from table.
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
* prototech/ticket/12130:
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
Merge branch 'ticket/12413' into ticket/12413-ascraeus
* ticket/12413:
[ticket/12413] Revert e65a6dd8f4
Conflicts:
phpBB/feed.php
The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.
PHPBB3-12413
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"
This reverts commit e65a6dd8f4, reversing
changes made to 214f515e9c.
PHPBB3-12413
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* Elsensee/ticket/12193:
[ticket/12193] Fix broken HTML if SQL error occurs during migration
