2 files changed, 53 insertions, 1 deletions
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index c76c727ba5..cedfa870fa 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -37,7 +37,14 @@ class phpbb_template_twig_node_event extends Twig_Node
 
     		if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
     		{
-    			$compiler->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n");
+    			$compiler
+    				->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+
+    				// We set the namespace lookup order to be this extension first, then the main path
+    				->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
+    				->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
+    				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+    			;
 			}
 		}
     }
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
new file mode 100644
index 0000000000..df7a95af44
--- /dev/null
+++ b/phpBB/includes/template/twig/node/include.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_include extends Twig_Node_Include
+{
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+    	$location = $this->getNode('expr')->getAttribute('value');
+    	$namespace = false;
+
+    	if (strpos($location, '@') === 0)
+    	{
+    		$namespace = substr($location, 1, strpos($location, '/') - 1);
+
+    		$compiler
+    			->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+
+    			// We set the namespace lookup order to be this namespace first, then the main path
+    			->write("\$this->env->setNamespaceLookUpOrder(array('" . $namespace . "', '__main__'));\n")
+    		;
+		}
+
+        parent::compile($compiler);
+
+    	if ($namespace)
+    	{
+    		$compiler
+    			->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+    		;
+		}
+    }
+}