Merge branch '3.2.x'

phpBB/phpbb/template/twig/loader.php

@@ -100,6 +100,16 @@ class loader extends \Twig_Loader_Filesystem
 		return;
 	}
 
+	/**
+	 * Adds a realpath call to fix a BC break in Twig 1.26 (https://github.com/twigphp/Twig/issues/2145)
+	 *
+	 * {@inheritdoc}
+	 */
+	public function addPath($path, $namespace = self::MAIN_NAMESPACE)
+	{
+		return parent::addPath($this->filesystem->realpath($path), $namespace);
+	}
+
 	/**
 	* Find the template
 	*