4 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/phpbb/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php
index 39653f6d26..cb3c953692 100644
--- a/phpBB/phpbb/template/twig/definition.php
+++ b/phpBB/phpbb/template/twig/definition.php
@@ -25,6 +25,8 @@ class definition
 	* Get a DEFINE'd variable
 	*
 	* @param string $name
+	* @param array $arguments
+	*
 	* @return mixed Null if not found
 	*/
 	public function __call($name, $arguments)
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index 8d25153e14..476ffd935e 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -36,11 +36,10 @@ class environment extends \Twig_Environment
 	/**
 	* Constructor
 	*
-	* @param \phpbb\config\config $phpbb_config
-	* @param \phpbb\path_helper
-	* @param \phpbb\extension\manager
-	* @param string $phpbb_root_path
-	* @param \Twig_LoaderInterface $loader
+	* @param \phpbb\config\config $phpbb_config The phpBB configuration
+	* @param \phpbb\path_helper $path_helper phpBB path helper
+	* @param \phpbb\extension\manager $extension_manager phpBB extension manager
+	* @param \Twig_LoaderInterface $loader Twig loader interface
 	* @param array $options Array of options to pass to Twig
 	*/
 	public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array())
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 8f523684dd..3a983491b9 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -162,7 +162,6 @@ class extension extends \Twig_Extension
 	* (e.g. in the ACP, L_TITLE)
 	* If not, we return the result of $user->lang()
 	*
-	* @param string $lang name
 	* @return string
 	*/
 	function lang()
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 5e2057f818..a3b002f350 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -177,6 +177,10 @@ class twig extends \phpbb\template\base
 		}
 
 		$names = $this->get_user_style();
+		// Add 'all' folder to $names array
+		//	It allows extensions to load a template file from 'all' folder,
+		//	if a style doesn't include it.
+		$names[] = 'all';
 
 		$paths = array();
 		foreach ($style_directories as $directory)