aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Safety check for 2fb48d6Nathaniel Guse2013-07-041-1/+1
| | | | PHPBB3-11598
* Revert "[feature/twig] Call set_style in the foo/bar controller for ↵Nathaniel Guse2013-07-041-2/+0
| | | | | | functional tests" This reverts commit 5c39f26cd27d5e4a1debfa24407825906f42d346.
* [feature/twig] Attempt to automatically set style dir for ext controllersNathaniel Guse2013-07-042-2/+28
| | | | | | Extension authors can change it themselves if necessary PHPBB3-11598
* [feature/twig] Add test to make sure nested loops get the correct S_ROW_COUNTNathaniel Guse2013-07-042-0/+13
| | | | PHPBB3-11598
* [feature/twig] Indentation and commentsNathaniel Guse2013-07-042-10/+12
| | | | PHPBB3-11598
* [feature/twig] Call set_style in the foo/bar controller for functional testsNathaniel Guse2013-07-041-0/+2
| | | | PHPBB3-11598
* [feature/twig] Add set_style function to controller helperNathaniel Guse2013-07-042-1/+25
| | | | PHPBB3-11598
* [feature/twig] Change style->set_style to accept a list of base directoriesNathaniel Guse2013-07-043-35/+56
| | | | | | | | | | | | | | | set_style now accepts an array containing a list of paths, e.g. array( 'ext/foo/bar/styles', 'styles'). Default: array('styles') Using this option allows us to set the style based on the user's preferred style (including the full tree), but use one or more base directories to add the paths from. The main use for this ability is so that extensions can call set_style, including their path and the phpBB styles path (or any others) and have their template files loaded from those directories (in the order given). PHPBB3-11598
* [feature/twig] Debugging test failuresNathaniel Guse2013-07-031-0/+6
| | | | PHPBB3-11598
* [feature/twig] Fix begin loop var regexNathaniel Guse2013-07-021-2/+2
| | | | PHPBB3-11598
* [feature/twig] Prevent errors from mkdir if the dir already existsNathaniel Guse2013-07-021-1/+4
| | | | PHPBB3-11598
* [feature/twig] template->cachepath is now private, missed checking testsNathaniel Guse2013-07-022-2/+6
| | | | PHPBB3-11598
* [feature/twig] Move test_php back to template_testNathaniel Guse2013-07-022-30/+16
| | | | | | | | Was originally moved because I thought that a new test file might mean a new instance and the memory would be cleared, fixing the original problem, but that isn't true and it was fixed another way. PHPBB3-11598
* [feature/twig] Should compare to $this->test_path rather than hardcoded pathNathaniel Guse2013-07-021-6/+6
| | | | PHPBB3-11598
* [feature/twig] Fix indentationNathaniel Guse2013-07-0216-357/+368
| | | | PHPBB3-11598
* [feature/twig] Remove getCacheFilename function I was working onNathaniel Guse2013-07-021-30/+0
| | | | | | | This can be addressed later if we decide we want to have more nicely named cache files. It does not need to be addressed now PHPBB3-11598
* [feature/twig] Remove reference to cachepath, it is not used publicly anymoreNathaniel Guse2013-07-022-3/+4
| | | | PHPBB3-11598
* [feature/twig] Check the template context for language varsNathaniel Guse2013-07-022-2/+36
| | | | | | | | We output some language vars to the context (e.g. L_TITLE in the ACP). These do not exist in user->lang, so we must check the context vars first, if not in context, we output the result of user->lang. PHPBB3-11598
* [feature/twig] Fix BBCode parserNathaniel Guse2013-07-023-1/+18
| | | | PHPBB3-11598
* [feature/twig] Fix includejs testNathaniel Guse2013-07-022-7/+7
| | | | PHPBB3-11598
* [feature/twig] Fix template test caseNathaniel Guse2013-07-021-1/+1
| | | | PHPBB3-11598
* [feature/twig] INCLUDEPHP behavior now supports local relative pathsNathaniel Guse2013-07-021-1/+8
| | | | | | | | | As a last resort, now we use the Twig Loader to find the correct file to include to (most specific file first, then parent styles). Also allows using @namespace convention. This is ONLY done if the specified path is not an absolute path AND the file does not exist relative to the phpBB root path. PHPBB3-11598
* [feature/twig] INCLUDEJS behavior now supports local relative pathsNathaniel Guse2013-07-029-12/+20
| | | | | | | | | 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-024-4/+23
| | | | | | | 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-012-17/+46
|\ | | | | | | | | | | | | | | | | | | | | | | # 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 branch 'develop-olympus' into developAndreas Fischer2013-07-011-4/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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/10838] Updated RUNNING_TESTS.md
| | * Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympusAndreas Fischer2013-07-011-4/+34
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10838: [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/10838] Updated RUNNING_TESTS.md
| | | * [ticket/10838] Fix URL for wiki and remove irrelevant lineDhruv2013-07-021-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10838
| | | * [ticket/10838] Remove php 5.4 and builtin server referencesDhruv2013-07-021-7/+1
| | | | | | | | | | | | | | | | PHPBB3-10838
| | | * [ticket/10838] Fix missing dataDhruv2013-07-021-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10838
| | | * [ticket/10838] separate database used mentioned in unit testsDhruv2013-07-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate database used for tests which is deleted each time tests are run information is added to unit tests. PHPBB3-10838
| | | * [ticket/10838] Updated RUNNING_TESTS.mdDhruv2013-06-271-0/+36
| | | | | | | | | | | | | | | | PHPBB3-10838
| * | | 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-012-6/+12
| | | | | | | | | | | | | | | | | | | | 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-0110-12/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598