diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 10:58:03 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 10:58:03 -0500 |
| commit | b4a374dc73eda55db1c67b87bd65a73f79411ef5 (patch) | |
| tree | ae392771a6aad76517e46b17c26797037c036a61 /phpBB/phpbb/filesystem.php | |
| parent | 21624e79fc512fd86177080010bb7d26c71ce3cb (diff) | |
| download | forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.gz forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.bz2 forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.xz forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.zip | |
[ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
Diffstat (limited to 'phpBB/phpbb/filesystem.php')
| -rw-r--r-- | phpBB/phpbb/filesystem.php | 33 |
1 files changed, 31 insertions, 2 deletions
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 @@ -28,18 +28,27 @@ class phpbb_filesystem protected $phpbb_root_path; /** @var string */ + protected $adm_relative_path; + + /** @var string */ + protected $php_ext; + + /** @var string */ protected $web_root_path; /** * 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; } /** @@ -53,6 +62,26 @@ class phpbb_filesystem } /** + * 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 * * This replaces $phpbb_root_path . some_url with |