diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-09 17:25:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-09 17:25:00 +0200 |
| commit | e399dc162b9d66992eb66fa2de0bedf524fb1ecf (patch) | |
| tree | 9b8567eff322a58f898f091c0c349ca934df93b5 /phpBB/phpbb/template/twig/twig.php | |
| parent | a053638c3df339ce6fb61876c018a5aa94614487 (diff) | |
| parent | 0f83d7fd6cf6819c0fe2f4bfa9f65873f7124b72 (diff) | |
| download | forums-e399dc162b9d66992eb66fa2de0bedf524fb1ecf.tar forums-e399dc162b9d66992eb66fa2de0bedf524fb1ecf.tar.gz forums-e399dc162b9d66992eb66fa2de0bedf524fb1ecf.tar.bz2 forums-e399dc162b9d66992eb66fa2de0bedf524fb1ecf.tar.xz forums-e399dc162b9d66992eb66fa2de0bedf524fb1ecf.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11701' into develop
* EXreaction/ticket/11701:
[ticket/11701] New line at EOF
[ticket/11701] Test events in loops
[ticket/11701] Refix regex for appending |length
[ticket/11701] Fix regex for appending |length
[ticket/11701] Fix loops var check
[ticket/11701] Remove useless str_replace
[ticket/11701] Loop variables are not passed correctly to events
Diffstat (limited to 'phpBB/phpbb/template/twig/twig.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/twig.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index 92a37d1634..6cff1bb8e4 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -429,15 +429,15 @@ class phpbb_template_twig implements phpbb_template $vars = array_merge( $context_vars['.'][0], // To get normal vars - $context_vars, // To get loops array( 'definition' => new phpbb_template_twig_definition(), 'user' => $this->user, + 'loops' => $context_vars, // To get loops ) ); // cleanup - unset($vars['.']); + unset($vars['loops']['.']); return $vars; } |