From afb804fe1efabd72b2eb4364d9a2652e80a8ae27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sun, 25 Jun 2017 17:01:22 +0200 Subject: [PATCH] [ticket/15253] Fix exception route PHPBB3-15253 --- phpBB/phpbb/storage/adapter/local.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php index 00b51c64f0..dcc6d57793 100644 --- a/phpBB/phpbb/storage/adapter/local.php +++ b/phpBB/phpbb/storage/adapter/local.php @@ -14,7 +14,7 @@ namespace phpbb\storage\adapter; use phpbb\storage\exception\exception; -use phpbb\filesystem\filesystem_exception; +use phpbb\filesystem\exception\filesystem_exception; class local implements adapter_interface { @@ -31,10 +31,10 @@ class local implements adapter_interface /** * Constructor */ - public function __construct(\phpbb\config\config $config, \phpbb\filesystem\filesystem $filesystem, $root_path, $path_key) + public function __construct(\phpbb\config\config $config, \phpbb\filesystem\filesystem $filesystem, $phpbb_root_path, $path_key) { $this->filesystem = $filesystem; - $this->root_path = $root_path.$config[$path_key]; + $this->root_path = $phpbb_root_path.$config[$path_key]; if(substr($this->root_path, -1, 1) != DIRECTORY_SEPARATOR) { @@ -47,7 +47,7 @@ class local implements adapter_interface */ public function put_contents($path, $content) { - if ($this->exists($this->root_path.$path)) + if ($this->exists($path)) { throw new exception('', $path); // FILE_EXISTS } @@ -67,7 +67,7 @@ class local implements adapter_interface */ public function get_contents($path) { - if (!$this->exists($this->root_path.$path)) + if (!$this->exists($path)) { throw new exception('', $path); // FILE_DONT_EXIST }