aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template
Commit message (Collapse)AuthorAgeFilesLines
* [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-011-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * [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
* | [feature/twig] No longer using the phpbb_template_locatorNathaniel Guse2013-06-251-23/+33
| | | | | | | | | | | | This functionality is handled by the Twig Filesystem Loader PHPBB3-11598
* | [feature/twig] Don't require phpbb_config, some tests pass nullNathaniel Guse2013-06-251-1/+1
| | | | | | | | PHPBB3-11598
* | [feature/twig] INCLUDEPHP token abs paths & fix testNathaniel Guse2013-06-251-3/+11
| | | | | | | | PHPBB3-11598
* | [feature/twig] INCLUDEPHP token, replace variable usage with $contextNathaniel Guse2013-06-251-3/+6
| | | | | | | | | | | | I could find no better way to do this... PHPBB3-11598
* | [feature/twig] INCLUDEPHP token supportNathaniel Guse2013-06-253-0/+114
| | | | | | | | PHPBB3-11598
* | [feature/twig] Add a comment to tpl output if PHP used, but disabledNathaniel Guse2013-06-251-4/+8
| | | | | | | | PHPBB3-11598
* | [feature/twig] Pass parameters required to twig env via constructorNathaniel Guse2013-06-252-43/+36
| | | | | | | | | | | | Instead of creating set functions PHPBB3-11598
* | [feature/twig] PHP token supportNathaniel Guse2013-06-254-0/+89
| | | | | | | | PHPBB3-11598
* | [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
| | | | | | | | | | | | Some fixes for main template parser PHPBB3-11598
* | [feature/twig] Working on fixing testsNathan Guse2013-06-243-30/+68
| | | | | | | | PHPBB3-11598
* | [feature/twig] Only set extensions if extension manager is loadedNathan Guse2013-06-241-1/+4
| | | | | | | | PHPBB3-11598
* | [feature/twig] Fixing file header copyrightsNathan Guse2013-06-245-105/+35
| | | | | | | | PHPBB3-11598
* | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-242-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | [feature/twig] Fix <!-- .blah since the being node was changedNathan Guse2013-06-242-2/+7
| | | | | | | | PHPBB3-11598
* | [feature/twig] Able to set chain of namespaces to search for loadTemplate()Nathan Guse2013-06-244-3/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | [feature/twig] Use twig->display rather than echo twig->renderNathan Guse2013-06-241-1/+1
| | | | | | | | PHPBB3-11598
* | [feature/twig] Event template tagNathan Guse2013-06-244-40/+97
| | | | | | | | PHPBB3-11598
* | [feature/twig] Changing method for begin node to not use anonymous functionNathan Guse2013-06-233-3/+89
| | | | | | | | | | | | | | 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
* | [feature/twig] Setup the style chain/loader properlyNathaniel Guse2013-06-181-18/+26
| | | | | | | | PHPBB3-11598
* | [feature/twig] Fix begin loops & subloopsNathaniel Guse2013-06-152-43/+52
| | | | | | | | PHPBB3-11598
* | [feature/twig] Throw exceptions (don't catch and ignore)Nathaniel Guse2013-06-141-1/+1
| | | | | | | | PHPBB3-11598
* | [feature/twig] Add && and || supportNathaniel Guse2013-06-141-0/+3
| | | | | | | | PHPBB3-11598
* | [feature/twig] Use twig loader filesystem with namespaces to add pathsNathaniel Guse2013-06-142-9/+49
| | | | | | | | | | | | Twig now handles loading style files on its own PHPBB3-11598
* | [feature/twig] Use phpBB's resource locator to find templatesNathan Guse2013-06-122-1/+51
| | | | | | | | PHPBB3-11598
* | [feature/twig] Some additional operators, more stuff for IFNathan Guse2013-06-125-5/+54
| | | | | | | | PHPBB3-11598
* | [feature/twig] Correcting output of INCLUDEJSNathan Guse2013-06-122-57/+27
| | | | | | | | PHPBB3-11598