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/filesystem.php | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/filesystem.php')

diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php
index e6c36375af..433fa9a62b 100644
--- a/phpBB/phpbb/filesystem.php
+++ b/phpBB/phpbb/filesystem.php
@@ -27,6 +27,12 @@ class phpbb_filesystem
 	/** @var string */
 	protected $phpbb_root_path;
 
+	/** @var string */
+	protected $adm_relative_path;
+
+	/** @var string */
+	protected $php_ext;
+
 	/** @var string */
 	protected $web_root_path;
 
@@ -34,12 +40,15 @@ class phpbb_filesystem
 	* Constructor
 	*
 	* @param phpbb_symfony_request $symfony_request
-	* @param string $phpbb_root_path
+	* @param string $phpbb_root_path Relative path to phpBB root
+	* @param string $php_ext PHP extension (php)
 	*/
-	public function __construct(phpbb_symfony_request $symfony_request, $phpbb_root_path)
+	public function __construct(phpbb_symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null)
 	{
 		$this->symfony_request = $symfony_request;
 		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->adm_relative_path = $adm_relative_path;
 	}
 
 	/**
@@ -52,6 +61,26 @@ class phpbb_filesystem
 		return $this->phpbb_root_path;
 	}
 
+	/**
+	* Get the adm root path
+	*
+	* @return string
+	*/
+	public function get_adm_relative_path()
+	{
+		return $this->adm_relative_path;
+	}
+
+	/**
+	* Get the php extension
+	*
+	* @return string
+	*/
+	public function get_php_ext()
+	{
+		return $this->php_ext;
+	}
+
 	/**
 	* Update a path to the correct relative root path
 	*
-- 
cgit v1.2.1