aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] INCLUDEJS behavior now supports local relative pathsNathaniel Guse2013-07-021-2/+10
| | | | | | | | | This was done because T_TEMPLATE_PATH is not always correct for js files (e.g. the inheriting style does not include these). Now we use the Twig Loader to find the correct file to link to (most specific file first, then parent styles). Also allows using @namespace convention PHPBB3-11598
* [feature/twig] INCLUDEJS now uses the definition classNathaniel Guse2013-07-022-2/+21
| | | | | | | This had to be done because, like DEFINE, setting variables to $context only affected the local file and any children, not parent templates. PHPBB3-11598
* [feature/twig] Update phpbb_template interfaceNathaniel Guse2013-07-012-23/+47
| | | | | | Return $this wherever possible PHPBB3-11598
* [feature/twig] Should have been elseNathaniel Guse2013-07-011-1/+1
| | | | PHPBB3-11598
* [feature/twig] Fix call for previous change to var name caseNathaniel Guse2013-07-011-1/+1
| | | | PHPBB3-11598
* [feature/twig] CommentsNathaniel Guse2013-07-011-8/+7
| | | | PHPBB3-11598
* [feature/twig] Use correct case for variable nameNathaniel Guse2013-07-011-3/+3
| | | | PHPBB3-11598
* [feature/twig] Fixed tabs in environment.phpNathaniel Guse2013-07-011-40/+41
| | | | PHPBB3-11598
* [feature/twig] Clean up the messenger a little bitNathaniel Guse2013-07-011-41/+60
| | | | | | | | | This should fix at least one bug, noticed we were using: $this->vars = &$this->tpl_obj->_rootref; Which hasn't been valid for a long+ time PHPBB3-11598
* [feature/twig] Don't forget to set the context when rendering!Nathaniel Guse2013-07-011-1/+1
| | | | PHPBB3-11598
* [feature/twig] Remove get_lang function (it's not used anywhere)Nathaniel Guse2013-07-011-21/+1
| | | | PHPBB3-11598
* [feature/twig] Do not assign var by referenceNathaniel Guse2013-07-011-3/+2
| | | | PHPBB3-11598
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-011-13/+12
|\ | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Andreas Fischer (3) and Dhruv (1) * 'develop' of https://github.com/phpbb/phpbb3: [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [ticket/10838] Updated RUNNING_TESTS.md
| * Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into developAndreas Fischer2013-07-011-13/+12
| |\ | | | | | | | | | | | | * dhruvgoel92/ticket/11585: [ticket/11585] Make $auth_admin class property
| | * [ticket/11585] Make $auth_admin class propertyDhruv2013-07-021-13/+12
| | | | | | | | | | | | | | | | | | | | | $auth_admin is class property and used via $this reference in all methods PHPBB3-11585
* | | [feature/twig] Fix length replace in lexerNathaniel Guse2013-07-011-1/+1
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Prevent errors from empty user->styleNathaniel Guse2013-07-011-1/+1
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Use adm_relative_path to build admin namespaceNathaniel Guse2013-07-011-6/+11
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Remove classes related to old template engineNathaniel Guse2013-07-015-2062/+0
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Remove debug code, set debug/auto reload correctlyNathaniel Guse2013-07-011-6/+2
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Remove resource locator dependency from templateNathaniel Guse2013-07-013-4/+3
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fix template/context.phpNathaniel Guse2013-07-011-2/+2
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Remove the twig loader class that I started (don't use it)Nathaniel Guse2013-07-011-51/+0
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598
* | | [feature/twig] Fix includephp nodeNathaniel Guse2013-07-011-8/+6
| | | | | | | | | | | | PHPBB3-11598
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-012-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (7) and others # Via Andreas Fischer (7) and others * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11593] initialize $is_expr as null before being passed to get_varref [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/11618] Replace glob() with scandir() and string matching [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars Conflicts: tests/template/template_test_case.php
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-291-3/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/9341: [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars
| | * | [ticket/9341] remove PREV_PAGE tpl var used for backward compatabilityDhruv2013-06-271-1/+0
| | | | | | | | | | | | | | | | PHPBB3-9341
| | * | [ticket/9341] Correctly named template varssakimahesh2013-06-221-2/+2
| | |/ | | | | | | | | | PHPBB3-9341
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into developAndreas Fischer2013-06-291-0/+1
| |\ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11593: [ticket/11593] initialize $is_expr as null before being passed to get_varref
| | * | [ticket/11593] initialize $is_expr as null before being passed to get_varrefDhruv2013-06-291-0/+1
| | |/ | | | | | | | | | PHPBB3-11593
* | | [feature/twig] A bit of cleanup in twig.phpNathaniel Guse2013-07-011-11/+14
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_blockNathaniel Guse2013-07-011-0/+22
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Add addslashes filter (to use on LA_ instead of escape)Nathaniel Guse2013-07-012-2/+3
| | | | | | | | | | | | | | | | | | To match previous parser behavior PHPBB3-11598
* | | [feature/twig] Remove the get_rootref and get_tpldata functions prev addedNathaniel Guse2013-07-012-24/+3
| | | | | | | | | | | | | | | | | | These are not really necessary PHPBB3-11598
* | | [feature/twig] Transform {L_, {LA_ to use the lang() functionNathaniel Guse2013-07-013-16/+47
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fixing include nodeNathaniel Guse2013-07-011-17/+19
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fixing define nodeNathaniel Guse2013-07-011-3/+3
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fixing div by replacementNathaniel Guse2013-07-011-3/+3
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Adding ! operatorNathaniel Guse2013-07-011-5/+7
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Add S_NUM_ROWS to loops in contextNathaniel Guse2013-06-291-0/+5
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Adding some operators to the extensionNathaniel Guse2013-06-291-3/+7
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fixing more stuff for DEFINE/INCLUDENathaniel Guse2013-06-292-9/+44
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fixing DEFINE statementsNathaniel Guse2013-06-295-33/+196
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] New Twig filter, subsetNathaniel Guse2013-06-282-5/+46
| | | | | | | | | | | | | | | | | | | | | This filter grabs a subset of a loop for output (according to past functionality). PHPBB3-11598
* | | [feature/twig] Replace BEGIN with Twig for using LexerNathaniel Guse2013-06-265-213/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer using the begin tokenparser/node as it did not allow proper handling of <!-- BEGIN !foo, <!-- BEGIN foo(0,2). Now the lexer will use regular expressions to handle that correctly and replace it with Twig's for token Also fixing <!-- IF .foo as I discovered it evaluates to if sizeof(foo) PHPBB3-11598
* | | [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter)Nathaniel Guse2013-06-261-4/+4
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNTNathaniel Guse2013-06-261-0/+3
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Forgot to set up $config in node/php.phpNathaniel Guse2013-06-251-0/+2
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Going back to Twig's handling of cache file names for nowNathaniel Guse2013-06-251-3/+15
| | | | | | | | | | | | | | | | | | My method was not working correctly, will work on it more later. PHPBB3-11598