# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10714: (56 commits)
[ticket/10714] Get log from container in install, update and download/file
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/10714] Update add_log docs block with @param and @deprecated
[ticket/10714] Remove fallback code from previous commits and move global
[ticket/10714] Fix missing parameter and global phpbb_log in unit tests
[ticket/10714] Add getter for is_in_admin and use it
[ticket/10714] Fix more comments
[ticket/10714] Cast values to integer before using them in the query
[ticket/10714] Fix several doc blocks and comments
[ticket/10714] Fix missing 8th argument in unit tests
[ticket/10714] Use new core.adm_relative_path to create the object.
[ticket/10714] Fix several comments and variable names
[ticket/10714] Fix database driver class name
[ticket/10714] Forgot most important, use container to create $phpbb_log
[ticket/10714] Remove type hinting to allow the usage of mocks in tests
[ticket/10714] Fix dependency injections in unit tests with mocks
[ticket/10714] Use dependencies instead of globals
[ticket/10714] Compare log_type to false, rather then null
[ticket/10714] Add global variables for the unit tests
...
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
[ticket/11386] Fix missing ;
[ticket/11386] Send list of migrations instead of using load_migrations
Remove dependency of extension manager for migrator.
Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.
PHPBB3-11386
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
- 460470229d972b93ef5a98b0d1d97a2a970d684f
- 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.
PHPBB3-11201
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
[ticket/11171] Moved the DB schema changes to its place
[ticket/11171] Cleanup of leftovers
[ticket/11171] Adapted the code in report.php
[ticket/11171] Use the options stored to decide how to show it
[ticket/11171] DB changes for the update
[ticket/11171] DB additions for these changes
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
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
* develop-olympus:
[ticket/11278] Comment out the code for dropping the Q&A tables
[ticket/11278] Fix not running queries from db tools in database update
Conflicts:
phpBB/install/database_update.php
Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on
firebird. It was possible for board administrators to adjust the code to
work. If code was manually adjusted by board administrators, index names
would not be the same as what 3.0.9 and newer expect. This code fragment
drops captcha tables, destroying all entered Q&A captcha configuration,
such that when Q&A is configured next the respective tables will be
created with corrent index names.
If you wish to preserve your Q&A captcha configuration, you can manually
rename indexes to the currently expected name:
phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang
phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid
Again, this needs to be done only if a board was manually modified to fix
broken captcha code.
PHPBB3-11278
The db_tools class is running in return mode, which means that the queries
are not run, but just returned. Therefor the broken tables were not
removed from the database.
PHPBB3-11278
* upstream/develop: (101 commits)
[ticket/10491] Make recreate_database static.
[ticket/11088] Pass required objects in as arguments
[ticket/11088] Globalize objects in new permission function
[ticket/11088] Move permission creation to a function
[ticket/11088] Copy a_styles permission for a_extensions
[ticket/11088] Remove extraneous word from sentence in comment
[ticket/11088] Changed "file extensions" to "attachment extensions"
[ticket/11088] Fix the database updater to correctly manipulate the modules
[ticket/11088] Put language pack module move below extension module creation
[ticket/11088] Untested, progress on update script
[ticket/11088] Fix typo (period instead of comma)
[ticket/11088] Untested progress for update script
[ticket/11088] Added missing comma
[ticket/11088] Removed added space
[ticket/11088] Move style, extension and language pack management to customise
[ticket/11243] Show download all link on all pages of topic with attachments
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Pass arguments in correct order.
[ticket/10491] Install board once per test run.
[ticket/11257] Do not require set_name() method to exist
...
