diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-10-29 19:12:32 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-10-29 19:12:32 -0700 |
| commit | 16213c92fe71cb1029bdac3b797529c6c74f6e96 (patch) | |
| tree | 2256b3b880d113b814cd8c8b42b415dd407f0ef1 /phpBB/phpbb/template/twig/node | |
| parent | 67beb97efec06c4a663c7eec8d54ab3194744f83 (diff) | |
| parent | 2f1cf0d287f416f1c3b388d5d3e68d897f226aaf (diff) | |
| download | forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.gz forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.bz2 forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.xz forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.zip | |
[ticket/11935] Merge remote-tracking branch 'upstream/develop'
PHPBB3-11935
Diffstat (limited to 'phpBB/phpbb/template/twig/node')
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includephp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php index 4024cf0cc8..70dcf85d62 100644 --- a/phpBB/phpbb/template/twig/node/includephp.php +++ b/phpBB/phpbb/template/twig/node/includephp.php @@ -23,7 +23,7 @@ class includephp extends \Twig_Node /** @var Twig_Environment */ protected $environment; - public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $ignoreMissing = false, $lineno, $tag = null) + public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false, $tag = null) { $this->environment = $environment; |