3 files changed, 114 insertions, 0 deletions
diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index c9b719546f..9d465a4db8 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -31,6 +31,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
 			new phpbb_template_twig_tokenparser_event,
+			new phpbb_template_twig_tokenparser_includephp,
 			new phpbb_template_twig_tokenparser_php,
 		);
 	}
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
new file mode 100644
index 0000000000..0f964556f0
--- /dev/null
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_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)
+    {
+    	$this->environment = $environment;
+
+        parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+		$config = $this->environment->get_phpbb_config();
+
+		if (!$config['tpl_allow_php'])
+		{
+			$compiler
+				->write("// INCLUDEPHP Disabled\n")
+			;
+
+			return;
+		}
+
+        if ($this->getAttribute('ignore_missing')) {
+            $compiler
+                ->write("try {\n")
+                ->indent()
+            ;
+        }
+
+		$compiler
+			->write("include(\$this->getEnvironment()->get_phpbb_root_path() . ")
+			->subcompile($this->getNode('expr'), true)
+			->raw(");\n")
+		;
+
+        if ($this->getAttribute('ignore_missing')) {
+            $compiler
+                ->outdent()
+                ->write("} catch (Twig_Error_Loader \$e) {\n")
+                ->indent()
+                ->write("// ignore missing template\n")
+                ->outdent()
+                ->write("}\n\n")
+            ;
+        }
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/includes/template/twig/tokenparser/includephp.php
new file mode 100644
index 0000000000..a81d663c09
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/includephp.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $expr = $this->parser->getExpressionParser()->parseExpression();
+
+        $stream = $this->parser->getStream();
+
+        $ignoreMissing = false;
+        if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
+            $stream->next();
+            $stream->expect(Twig_Token::NAME_TYPE, 'missing');
+
+            $ignoreMissing = true;
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'INCLUDEPHP';
+    }
+}