Was:
<!-- INCLUDEJS template/foo.js -->
Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->
Reasons for this:
1. INCLUDEJS is 3.1-dev only
2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)
3. INCLUDEJS could not include files from outside directories or anywhere
else
4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.
PHPBB3-11598
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 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
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11588] Also use version.phpbb.com in install_update.php.
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv (1)
* develop-olympus:
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
Conflicts:
phpBB/includes/search/fulltext_mysql.php
phpBB/language/en/acp/search.php
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11583:
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
