diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-04 23:50:16 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-05 17:07:11 +0200 |
| commit | 51376a43919cba7a5037edb7cc31f18b5950437b (patch) | |
| tree | 346e51469449521e40a25d875bcc3f7b8d7846f7 /phpBB/phpbb/template/asset.php | |
| parent | 321ed2a3dd10231a09dec18a85a783a73ba12ddf (diff) | |
| download | forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar.gz forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar.bz2 forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar.xz forums-51376a43919cba7a5037edb7cc31f18b5950437b.zip | |
[ticket/13638] Inject $filesystem in \phpbb\template\asset
PHPBB3-13638
Diffstat (limited to 'phpBB/phpbb/template/asset.php')
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index aa1689d71a..cb00f16549 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -20,15 +20,20 @@ class asset /** @var \phpbb\path_helper **/ protected $path_helper; + /** @var \phpbb\filesystem\filesystem */ + protected $filesystem; + /** * Constructor * * @param string $url URL * @param \phpbb\path_helper $path_helper Path helper object + * @param \phpbb\filesystem\filesystem $filesystem */ - public function __construct($url, \phpbb\path_helper $path_helper) + public function __construct($url, \phpbb\path_helper $path_helper, \phpbb\filesystem\filesystem $filesystem) { $this->path_helper = $path_helper; + $this->filesystem = $filesystem; $this->set_url($url); } @@ -153,7 +158,7 @@ class asset public function set_path($path, $urlencode = false) { // Since 1.7.0 Twig returns the real path of the file. We need it to be relative. - $real_root_path = phpbb_realpath($this->path_helper->get_phpbb_root_path()) . DIRECTORY_SEPARATOR; + $real_root_path = $this->filesystem->realpath($this->path_helper->get_phpbb_root_path()) . DIRECTORY_SEPARATOR; // If the asset is under the phpBB root path we need to remove its path and then prepend $phpbb_root_path if ($real_root_path && substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) @@ -163,7 +168,7 @@ class asset else { // Else we make the path relative to the current working directory - $real_root_path = phpbb_realpath('.') . DIRECTORY_SEPARATOR; + $real_root_path = $this->filesystem->realpath('.') . DIRECTORY_SEPARATOR; if ($real_root_path && substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) { $path = str_replace('\\', '/', substr($path, strlen($real_root_path))); |