aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-103-0/+34
|\ | | | | | | | | | | * rxu3/ticket/12224: [ticket/12224] Add assign_block_vars_array() test. [ticket/12224] Add template wrapper method to assign block arrays
| * [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
| | | | | | | | | | | | | | | | | | | | | | Add one more wrapper template method for the function assign_block_vars() which takes a 2-dimensional array as a parameter and calls assign_block_vars() in a loop to assign the whole block loop at once. This can make the core a little bit more expendable from the point of developing extensions as it allows to pass the data to events before it's being assigned to template. PHPBB3-12224
* | [ticket/12232] Fix a similar excessive pattern in the method.Cesar G2014-02-271-1/+2
| | | | | | | | PHPBB3-12232
* | [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() methodCesar G2014-02-271-1/+2
|/ | | | | | | | | | The size of the template block array is calculated within a foreach loop iterating through the array, which is unnecessary. It only needs to be done once. In a block of 1000 rows, this results in 500,500 calls to sizeof() in this location. With this change, that's reduced to 1000. PHPBB3-12232
* [ticket/12100] Re-order arguments in template environment constructorMatt Friedman2014-01-272-7/+8
| | | | PHPBB3-12100
* [ticket/12100] Ensure enabled extensions are fresh in Twig environmentMatt Friedman2014-01-272-7/+7
| | | | PHPBB3-12100
* [ticket/11943] Throw an exception if DEFINE is setup improperlyNathan Guse2013-11-091-0/+7
| | | | PHPBB3-11943
* [ticket/11943] Split fix_inline_variable_tokens into 3 stepsNathan Guse2013-11-081-10/+50
| | | | | | | DEFINE shouldn't add/remove surrounding quotes, but must have the inline variable tokens fixed PHPBB3-11943
* [ticket/11943] Require stricter DEFINE statements for templatesNathan Guse2013-11-081-9/+1
| | | | PHPBB3-11943
* [ticket/11943] Do not quote the value when it is exactly true, false, or nullNathan Guse2013-11-041-0/+8
| | | | | | Quoting these can change the meaning of the value (e.g. 'false' == true) PHPBB3-11943
* [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-303-43/+43
| | | | PHPBB3-11980
* [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.Andreas Fischer2013-10-3023-184/+0
| | | | PHPBB3-11980
* [task/code-sniffer] Fix argument list spacing.Andreas Fischer2013-10-291-1/+1
| | | | PHPBB3-11980
* [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-283-4/+4
| | | | PHPBB3-11981
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-264-28/+28
| | | | PHPBB3-11852
* Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
|\ | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
| * [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
| | | | | | | | PHPBB3-11816
* | [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-191-1/+1
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-2/+2
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-171-2/+2
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-174-15/+55
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) Conflicts: phpBB/common.php phpBB/config/services.yml phpBB/includes/bbcode.php phpBB/includes/functions.php phpBB/includes/functions_messenger.php phpBB/install/index.php phpBB/phpbb/filesystem.php phpBB/phpbb/template/twig/environment.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/dbal/migrator_test.php tests/extension/manager_test.php tests/extension/metadata_manager_test.php tests/filesystem/clean_path_test.php tests/mock/extension_manager.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-133-13/+47
| | | | | | | | PHPBB3-11832
* | [ticket/11700] And some last comments with backslashesNils Adermann2013-09-162-4/+4
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-165-6/+10
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1611-422/+511
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11843] The twig lexer fixes DEFINE variables with underscores againrechosen2013-09-131-1/+1
| | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/1708 accidentally stopped the twig lexer from fixing DEFINE variables with underscores in them. This commit restores that functionality. PHPBB3-11843
| * Merge pull request #1689 from EXreaction/ticket/11727David King2013-09-122-7/+165
| |\ | | | | | | [ticket/11727] Mark style directories safe to load from
| | * [ticket/11727] Fix indentationNathan Guse2013-09-121-1/+1
| | | | | | | | | | | | PHPBB3-11727
| | * [ticket/11727] Fix indentationNathan Guse2013-09-121-9/+9
| | | | | | | | | | | | PHPBB3-11727
| | * [ticket/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-022-7/+165
| | | | | | | | | | | | PHPBB3-11727
| * | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-121-3/+3
| |\ \ | | | | | | | | Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE
| | * | [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSENathan Guse2013-09-091-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11833
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-123-6/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Nathan Guse (6) and others * 'develop' of github.com:phpbb/phpbb3: (195 commits) [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [feature/oauth] Fix tabindex [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [ticket/11822] Use namespace lookup order for asset loading [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * \ \ Merge pull request #1708 from EXreaction/ticket/11828David King2013-09-121-4/+4
| | |\ \ \ | | | | | | | | | | | | [ticket/11828] Fix greedy operators in lexer
| | | * | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-121-4/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Use lazy operators and use stricter validation PHPBB3-11828
| | * | | Merge pull request #1690 from EXreaction/ticket/11822David King2013-09-122-2/+37
| | |\ \ \ | | | |/ / | | |/| | [ticket/11822] Use namespace lookup order for asset loading
| | | * | [ticket/11822] Use namespace lookup order for asset loadingNathan Guse2013-09-022-2/+37
| | | |/ | | | | | | | | | | | | PHPBB3-11822
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-065-380/+249
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King (16) and others # Via David King (13) and others * 'develop' of github.com:phpbb/phpbb3: (67 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * | [ticket/11812] Fix empty defineNathan Guse2013-09-021-1/+1
| | |/ | | | | | | | | | PHPBB3-11812
| | * Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11724: [ticket/11724] Handle ELSE IF separately [ticket/11724] Replace spaces with tabs [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
| | | * [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | | | | | | | | | | | | | | | PHPBB3-11724
| | | * [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11724
| | | * [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11724
| | * | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| | | | | | | | | | | | | | | | | | | | | | | | E.g. assign_vars PHPBB3-11628
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-283-11/+18
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * | | [ticket/11628] Make get_template_vars protectedNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all references to it and the hacky code in messenger that was using it PHPBB3-11628
| | * | | [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should not be setting $this->context = array()! PHPBB3-11628
| | * | | [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-242-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the code easier to follow PHPBB3-11628
| | * | | [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11628