makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
16989 commits 18 branches 192 tags 206 MiB
Commit graph

208 commits

Author SHA1 Message Date
Nathaniel Guse
02a8150bb6 [feature/twig] INCLUDEPHP behavior now supports local relative paths 
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
 2013-07-02 11:08:52 -05:00
Nathaniel Guse
59d13d0535 [feature/twig] INCLUDEJS behavior now supports local relative paths 
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
 2013-07-02 11:07:12 -05:00
Nathaniel Guse
156d5c671f [feature/twig] INCLUDEJS now uses the definition class 
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
 2013-07-02 10:13:16 -05:00
Nathaniel Guse
883b0a9f8c [feature/twig] Update phpbb_template interface 
Return $this wherever possible

PHPBB3-11598
 2013-07-01 21:44:00 -05:00
Nathaniel Guse
3b9cb7faa7 [feature/twig] Fix call for previous change to var name case 
PHPBB3-11598
 2013-07-01 21:29:15 -05:00
Nathaniel Guse
f902523956 [feature/twig] Comments 
PHPBB3-11598
 2013-07-01 21:24:27 -05:00
Nathaniel Guse
3dc40ad844 [feature/twig] Use correct case for variable name 
PHPBB3-11598
 2013-07-01 21:22:50 -05:00
Nathaniel Guse
e0f5e23032 [feature/twig] Fixed tabs in environment.php 
PHPBB3-11598
 2013-07-01 21:21:37 -05:00
Nathaniel Guse
8f303b376b [feature/twig] Don't forget to set the context when rendering! 
PHPBB3-11598
 2013-07-01 21:16:36 -05:00
Nathaniel Guse
1c7e077fea [feature/twig] Remove get_lang function (it's not used anywhere) 
PHPBB3-11598
 2013-07-01 21:11:24 -05:00
Nathaniel Guse
46d6899b46 [feature/twig] Do not assign var by reference 
PHPBB3-11598
 2013-07-01 20:41:36 -05:00
Nathaniel Guse
943728d3ef [feature/twig] Fix length replace in lexer 
PHPBB3-11598
 2013-07-01 14:58:20 -05:00
Nathaniel Guse
1a58d188aa [feature/twig] Prevent errors from empty user->style 
PHPBB3-11598
 2013-07-01 14:42:05 -05:00
Nathaniel Guse
d7cff78443 [feature/twig] Use adm_relative_path to build admin namespace 
PHPBB3-11598
 2013-07-01 13:39:51 -05:00
Nathaniel Guse
9fbba760fb [feature/twig] Remove classes related to old template engine 
PHPBB3-11598
 2013-07-01 13:34:28 -05:00
Nathaniel Guse
793ee3f8d9 [feature/twig] Remove debug code, set debug/auto reload correctly 
PHPBB3-11598
 2013-07-01 13:32:43 -05:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template 
PHPBB3-11598
 2013-07-01 13:28:08 -05:00
Nathaniel Guse
2d9bbe0ef2 [feature/twig] Fix template/context.php 
PHPBB3-11598
 2013-07-01 13:26:00 -05:00
Nathaniel Guse
341bae40eb [feature/twig] Remove the twig loader class that I started (don't use it) 
PHPBB3-11598
 2013-07-01 12:58:31 -05:00
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly 
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
 2013-07-01 12:26:01 -05:00
Nathaniel Guse
e9bbeeb1a4 [feature/twig] Fix includephp node 
PHPBB3-11598
 2013-07-01 12:23:25 -05:00
Nathaniel Guse
f08330f762 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# 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
 2013-07-01 12:03:24 -05:00
Nathaniel Guse
ddaccaf63e [feature/twig] A bit of cleanup in twig.php 
PHPBB3-11598
 2013-07-01 11:52:03 -05:00
Nathaniel Guse
4ee7fb1a9d [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_block 
PHPBB3-11598
 2013-07-01 10:57:57 -05:00
Nathaniel Guse
42e3a4bfb9 [feature/twig] Add addslashes filter (to use on LA_ instead of escape) 
To match previous parser behavior

PHPBB3-11598
 2013-07-01 10:17:58 -05:00
Nathaniel Guse
8d3fd1fcdd [feature/twig] Remove the get_rootref and get_tpldata functions prev added 
These are not really necessary

PHPBB3-11598
 2013-07-01 09:38:51 -05:00
Nathaniel Guse
9749405129 [feature/twig] Transform {L_, {LA_ to use the lang() function 
PHPBB3-11598
 2013-07-01 09:32:21 -05:00
Nathaniel Guse
658d1b6afe [feature/twig] Fixing include node 
PHPBB3-11598
 2013-07-01 09:20:46 -05:00
Nathaniel Guse
ecdc73a81a [feature/twig] Fixing define node 
PHPBB3-11598
 2013-07-01 09:19:54 -05:00
Nathaniel Guse
2c55671767 [feature/twig] Fixing div by replacement 
PHPBB3-11598
 2013-07-01 09:19:30 -05:00
Nathaniel Guse
c49d27329d [feature/twig] Adding ! operator 
PHPBB3-11598
 2013-07-01 09:18:58 -05:00
Nathaniel Guse
c477f865fb [feature/twig] Add S_NUM_ROWS to loops in context 
PHPBB3-11598
 2013-06-29 19:22:58 -05:00
Nathaniel Guse
82aa4edeab [feature/twig] Adding some operators to the extension 
PHPBB3-11598
 2013-06-29 19:22:01 -05:00
Nathaniel Guse
f18cbd50f0 [feature/twig] Fixing more stuff for DEFINE/INCLUDE 
PHPBB3-11598
 2013-06-29 19:19:18 -05:00
Nathaniel Guse
64963b5962 [feature/twig] Fixing DEFINE statements 
PHPBB3-11598
 2013-06-29 11:07:10 -05:00
Dhruv
5182ec09a5 [ticket/11593] initialize $is_expr as null before being passed to get_varref 
PHPBB3-11593
 2013-06-29 15:26:36 +05:30
Nathaniel Guse
abb7901edb [feature/twig] New Twig filter, subset 
This filter grabs a subset of a loop for output (according to past
functionality).

PHPBB3-11598
 2013-06-28 15:40:30 -05:00
Nathaniel Guse
09ed0dd7bc [feature/twig] Replace BEGIN with Twig for using Lexer 
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
 2013-06-26 12:30:59 -05:00
Nathaniel Guse
6d709525c3 [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter) 
PHPBB3-11598
 2013-06-26 12:27:32 -05:00
Nathaniel Guse
15e4b33495 [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNT 
PHPBB3-11598
 2013-06-26 09:09:11 -05:00
Nathaniel Guse
040186418a [feature/twig] Forgot to set up $config in node/php.php 
PHPBB3-11598
 2013-06-25 20:52:04 -05:00
Nathaniel Guse
6c771a38de [feature/twig] Going back to Twig's handling of cache file names for now 
My method was not working correctly, will work on it more later.

PHPBB3-11598
 2013-06-25 19:24:32 -05:00
Nathaniel Guse
7a9aec5fda [feature/twig] No longer using the phpbb_template_locator 
This functionality is handled by the Twig Filesystem Loader

PHPBB3-11598
 2013-06-25 19:23:42 -05:00
Nathaniel Guse
3766b736da [feature/twig] Don't require phpbb_config, some tests pass null 
PHPBB3-11598
 2013-06-25 18:06:45 -05:00
Nathaniel Guse
1c8c03c4db [feature/twig] INCLUDEPHP token abs paths & fix test 
PHPBB3-11598
 2013-06-25 16:51:50 -05:00
Nathaniel Guse
8bccba1a2f [feature/twig] INCLUDEPHP token, replace variable usage with $context 
I could find no better way to do this...

PHPBB3-11598
 2013-06-25 16:27:58 -05:00
Nathaniel Guse
e227f05e9a [feature/twig] INCLUDEPHP token support 
PHPBB3-11598
 2013-06-25 15:02:55 -05:00
Nathaniel Guse
99b776a4e5 [feature/twig] Add a comment to tpl output if PHP used, but disabled 
PHPBB3-11598
 2013-06-25 14:59:41 -05:00
Nathaniel Guse
68225d9f29 [feature/twig] Pass parameters required to twig env via constructor 
Instead of creating set functions

PHPBB3-11598
 2013-06-25 14:58:55 -05:00
Nathaniel Guse
ea785efb30 [feature/twig] PHP token support 
PHPBB3-11598
 2013-06-25 14:22:40 -05:00