From 423357581415c7c10ed0ac51284014e839881bac Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 2 Sep 2013 13:54:42 -0500
Subject: [ticket/11822] Use namespace lookup order for asset loading

PHPBB3-11822
---
 phpBB/phpbb/template/twig/environment.php | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'phpBB/phpbb/template/twig/environment.php')

diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index b60cd72325..9a40dc2b15 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -137,4 +137,39 @@ class phpbb_template_twig_environment extends Twig_Environment
 			return parent::loadTemplate($name, $index);
 		}
 	}
+
+	/**
+	 * Finds a template by name.
+	 *
+	 * @param string  $name  The template name
+	 * @return string
+	 */
+	public function findTemplate($name)
+	{
+		if (strpos($name, '@') === false)
+		{
+			foreach ($this->getNamespaceLookUpOrder() as $namespace)
+			{
+				try
+				{
+					if ($namespace === '__main__')
+					{
+						return parent::getLoader()->getCacheKey($name);
+					}
+
+					return parent::getLoader()->getCacheKey('@' . $namespace . '/' . $name);
+				}
+				catch (Twig_Error_Loader $e)
+				{
+				}
+			}
+
+			// We were unable to load any templates
+			throw $e;
+		}
+		else
+		{
+			return parent::getLoader()->getCacheKey($name);
+		}
+	}
 }
-- 
cgit v1.2.1


From b4a374dc73eda55db1c67b87bd65a73f79411ef5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 13 Sep 2013 10:58:03 -0500
Subject: [ticket/11832] Fix INCLUDE(JS/CSS)

PHPBB3-11832
---
 phpBB/phpbb/template/twig/environment.php | 33 +++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/environment.php')

diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index 9a40dc2b15..612519db69 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -23,9 +23,15 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/** @var phpbb_config */
 	protected $phpbb_config;
 
+	/** @var phpbb_filesystem */
+	protected $phpbb_filesystem;
+
 	/** @var string */
 	protected $phpbb_root_path;
 
+	/** @var string */
+	protected $web_root_path;
+
 	/** @var array **/
 	protected $namespace_look_up_order = array('__main__');
 
@@ -38,11 +44,14 @@ class phpbb_template_twig_environment extends Twig_Environment
 	* @param Twig_LoaderInterface $loader
 	* @param array $options Array of options to pass to Twig
 	*/
-	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
+	public function __construct($phpbb_config, $phpbb_extensions, phpbb_filesystem $phpbb_filesystem, Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 		$this->phpbb_extensions = $phpbb_extensions;
-		$this->phpbb_root_path = $phpbb_root_path;
+
+		$this->phpbb_filesystem = $phpbb_filesystem;
+		$this->phpbb_root_path = $this->phpbb_filesystem->get_phpbb_root_path();
+		$this->web_root_path = $this->phpbb_filesystem->get_web_root_path();
 
 		return parent::__construct($loader, $options);
 	}
@@ -79,6 +88,26 @@ class phpbb_template_twig_environment extends Twig_Environment
 		return $this->phpbb_root_path;
 	}
 
+	/**
+	* Get the web root path
+	*
+	* @return string
+	*/
+	public function get_web_root_path()
+	{
+		return $this->web_root_path;
+	}
+
+	/**
+	* Get the phpbb_filesystem object
+	*
+	* @return phpbb_filesystem
+	*/
+	public function get_filesystem()
+	{
+		return $this->phpbb_filesystem;
+	}
+
 	/**
 	* Get the namespace look up order
 	*
-- 
cgit v1.2.1