This is done so that when event template files are included, if they
include files themselves, that namespace is checked first, then __main__
is checked to include the correct template file.
Also, when template files are included from a particular namespace, this is
done so that the files from that namespace are included first, then the
main namespace is checked.
We may want to change this behavior in the future to allow choosing which
locations have priority, but for now, this is what I am doing to make sure
the behavior is simple and always the same.
PHPBB3-11598
The way it was setup would actually require PHP 5.4, which isn't an option
right now. Leaving the old code there, just commented out, for now at least.
PHPBB3-11598
Move phpbb_template class to phpbb_template_phpbb
Changed phpbb_template class to an interface
Switch services.yml to load phpbb_template_twig instead of phpbb_template
PHPBB3-11598
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11481:
[ticket/11481] Move prepended slash from calls into function
[ticket/11481] Remove globals and use dependency injection instead
[ticket/11481] Use container for all classes and inject dependencies
[ticket/11481] Move functions from feed into helper class
[ticket/11481] Move active topics feed to own file
[ticket/11481] Move topics feed to own file
[ticket/11481] Move news feed to own file
[ticket/11481] Move forums feed to own file
[ticket/11481] Move topic feed to own file
[ticket/11481] Move forum feed to own file
[ticket/11481] Move overall feed to own file
[ticket/11481] Move feed topic base to own file
[ticket/11481] Move feed post base to own file
[ticket/11481] Move feed base to own file
[ticket/11481] Move feed factory to own file
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/develop/11543:
[ticket/11543] Add more users so #hidden <> #normal
[ticket/develop/11543] Use plurals in develop
[ticket/11543] Use correct IP addresses and inject time for correct values
[ticket/11543] Add unit tests for obtain_users_online_string()
[ticket/11543] Add unit tests for obtain_users_online() with empty forum
[ticket/11543] Add unit tests for obtain_users_online()
[ticket/11543] Add unit tests for obtain_guest_count()
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11543:
[ticket/11543] Add more users so #hidden <> #normal
[ticket/11543] Use correct IP addresses and inject time for correct values
[ticket/11543] Add unit tests for obtain_users_online_string()
[ticket/11543] Add unit tests for obtain_users_online() with empty forum
[ticket/11543] Add unit tests for obtain_users_online()
[ticket/11543] Add unit tests for obtain_guest_count()
# By Joas Schilling
# Via Joas Schilling (1) and Nils Adermann (1)
* remotes/upstream/develop-olympus:
[ticket/11590] Close database connections when tearDown() is called
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568-develop: (21 commits)
[ticket/11568] Split status code and html debug assertion into two methods
[ticket/11568] Add comma at end of array key-value couple
[ticket/11568] Invert logic for asserting the response
[ticket/11568] Use static calls for static methods
[ticket/develop/11568] Remove unneccessary second call with wrong arguments
[ticket/11568] Remove unused method
[ticket/11568] Only assert string when doctype is there at all
[ticket/develop/11568] Fix some more tests in 3.1
[ticket/develop/11568] Remove php extension parameter
[ticket/develop/11568] Remove unneccessary calls to assert_response_success()
[ticket/develop/11568] Do not directly access $client from tests
[ticket/11568] Add method to get page content
[ticket/11568] Allow different status codes
[ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
[ticket/11568] Fix common_groups_test.php form handling
[ticket/11568] Make CookieJar static aswell
[ticket/11568] Remove manual calls to assert_response_success()
[ticket/11568] Only use a static version of the client
[ticket/11568] Any output before the doc type means there was an error
[ticket/11568] Set client manually so we can increase the cURL timeout
...
* 'develop' of https://github.com/phpbb/phpbb3: (29 commits)
[ticket/11588] Also use version.phpbb.com in install_update.php.
[ticket/11587] Add functional tests for group teampage settings
[ticket/11538] Add admin as admins leader and moderator in memberlist_test
[ticket/11587] Pass legend and teampage settings to group_create()
[ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
[ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
[ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
[ticket/11586] Combine administrator/moderator checks together.
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11122] Add dhruv to active authors
[ticket/11122] Remove Oleg and igorw from active authors
[ticket/10840] Add check_form_key to acp_groups.php
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
[ticket/11409] Add success message after updating group position settings
[ticket/11549] Add functional test for ACP Extension Module with Template
[ticket/11570] Fix link and make the notice more conspiciuous
[ticket/11549] Do not set extension dir path for style in adm/index.php
[ticket/11570] Add link back to update process
[ticket/11569] Add type parameter and fix language variable
[ticket/11569] Add parameter to URL and remove comment
...
Conflicts:
tests/functional/common_groups_test.php
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568:
[ticket/11568] Split status code and html debug assertion into two methods
[ticket/11568] Add comma at end of array key-value couple
[ticket/11568] Invert logic for asserting the response
[ticket/11568] Use static calls for static methods
[ticket/11568] Remove unused method
[ticket/11568] Only assert string when doctype is there at all
[ticket/11568] Add method to get page content
[ticket/11568] Allow different status codes
[ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
[ticket/11568] Fix common_groups_test.php form handling
[ticket/11568] Make CookieJar static aswell
[ticket/11568] Remove manual calls to assert_response_success()
[ticket/11568] Only use a static version of the client
[ticket/11568] Any output before the doc type means there was an error
[ticket/11568] Set client manually so we can increase the cURL timeout
[ticket/11568] Use Goutte Client to install the board for functional tests
* ticket/11543:
[ticket/11543] Use correct IP addresses and inject time for correct values
[ticket/11543] Add unit tests for obtain_users_online_string()
[ticket/11543] Add unit tests for obtain_users_online() with empty forum
[ticket/11543] Add unit tests for obtain_users_online()
[ticket/11543] Add unit tests for obtain_guest_count()
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11587:
[ticket/11587] Add functional tests for group teampage settings
[ticket/11587] Pass legend and teampage settings to group_create()
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/editor-code-tabs:
[feature/editor-code-tabs] Make inTag function reusable
[feature/editor-code-tabs] Check for browser support in function
[feature/editor-code-tabs] Apply code editor to everything
[feature/editor-code-tabs] Correctly count indentation on first line
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11564:
[ticket/11564] Missing new line in tweaks.css
[ticket/11564] Notifications popup fixes
