# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
[ticket/11574] Remove install/udpate/new/ fallback from database_update.php
[ticket/11574] Do not display incompatible package note after successful update
[ticket/11574] Remove old "continue step"-message
[ticket/11574] Change order of files and database update
[ticket/11574] Fix more issues in the updater
[ticket/11574] Add trailing slash for consistency
[ticket/11574] Fix table prefix in database updater
[ticket/11574] Fix various path issues in the updater
[ticket/11574] Make install language filename less crazy
[ticket/11574] Use alternate DI config file for updater
[ticket/11574] Include normalizer so it loads form the correct directory
[ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
[ticket/11574] Use log object instead of old function
[ticket/11574] Include vendor into update packages
[ticket/11574] Create phpbb_log object before using it.
[ticket/11574] Add correct language parameter to return links
[ticket/11574] Use request object rather then request_var function
[ticket/11574] Load new language files whenever possible
[ticket/11574] Require new files in install/index.php and add a class loader
[ticket/11574] Require new files in database_update.php and add a class loader
...
Example.org no longer serves blank responses, failing functional tests.
this patch creates a blank file and serve it locally during the test,
instead of hitting the http://example.org servers kindly provided by IANA.
PHPBB3-11761
* develop-olympus:
[ticket/11762] Added call to test class's parent::setUp().
[ticket/11762] Fixed test's filename
[ticket/11762] Use the === operator to distinguish "0" from ""
* phpbb/develop: (130 commits)
[ticket/11638] Changed the layout to match the other similar commits
[ticket/11640] removed the space that I wonder what it was doing there.
[ticket/11749] Move event after all template data has been defined
[ticket/10917] Variable used only once so delete it
[ticket/10917] Revert use of phpbb wrapper
[ticket/11749] Template events for topic_list_row_pre/append
[ticket/11749] PHP Events for viewforum.php
[ticket/11749] PHP Events for search.php
[ticket/11740] Update FAQ to include Ideas Centre
[ticket/11062] If user's language is english there is no further work needed
[ticket/11062] Load new strings from user's language file if provided
[ticket/10917] Using phpbb wrapper
[ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
[ticket/11741] Fix empty brackets and remove bullet
[ticket/11638] Removed the unneeded reset.
[ticket/11638] Use the $parse_flags like the other commits
[ticket/11638] Reverted to use the $parse tags way as the other ones
[ticket/11638] Updated: bitwise $parse_flags use optionset()
[ticket/11656] Made the check for the bitfield just like other PR's
[ticket/11667] Use @inheritdoc
...
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)
PHPBB3-11628
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument
PHPBB3-11628
* EXreaction/ticket/11718:
[ticket/11718] Quick test for fixes in ELSEIF
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
Conflicts:
tests/template/template_test.php
* asperous/ticket/11620: (46 commits)
[ticket/11620] Whitespace and combine function into test_case
[ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
[ticket/11620] Changed incorrect global variable
[ticket/11620] Minor indentation changes and comment clarity
[ticket/11620] Expected and actual test conditions wrongly swapped
[ticket/11620] Space between . in directory import concatenation
[ticket/11620] Changes to match merge
[ticket/11620] Changes for code guidelines consistency
[ticket/11620] Fix a static calls to non-static for session captcha
[ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
[ticket/11620] Update auth_provider for new interface
[ticket/11620] Added garbage_collection_test
[ticket/11620] Fixed check_ban_test errors with cache and ban warning message
[ticket/11620] Fixed a typo on check_ban_test
[ticket/11620] Refactored check_isvalid_test to use session_test_case
[ticket/11615] Refactored isvalid test to be more imperative
[ticket/11615] Rename continue -> check_isvalid for clarity
[ticket/11620] Added a test for checking if users are banned
[ticket/11620] Remove typo in beginning of session_key_test
[ticket/11620] Typo in file name session_key_tests -> test
...
