aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-07 23:22:53 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-29 20:54:41 +0200
commitb7e1959d56a3334f730e5d0fd4194f5e4d0597a3 (patch)
treed1db62ad9dcfa88c8f2e99748fdfe330346af04f /phpBB/phpbb/path_helper.php
parent[ticket/12099] Correctly fix the path when performing AJAX requests (diff)
downloadphpbb-b7e1959d56a3334f730e5d0fd4194f5e4d0597a3.tar.gz
phpbb-b7e1959d56a3334f730e5d0fd4194f5e4d0597a3.tar.bz2
phpbb-b7e1959d56a3334f730e5d0fd4194f5e4d0597a3.zip
[ticket/12099] Remove config again
PHPBB3-12099
Diffstat (limited to 'phpBB/phpbb/path_helper.php')
-rw-r--r--phpBB/phpbb/path_helper.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index 8552dbeb3a..ea45393709 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -27,9 +27,6 @@ class path_helper
/** @var \phpbb\request\request_interface */
protected $request;
- /** @var \phpbb\config\config */
- protected $config;
-
/** @var string */
protected $phpbb_root_path;
@@ -47,17 +44,16 @@ class path_helper
*
* @param \phpbb\symfony_request $symfony_request
* @param \phpbb\filesystem $filesystem
- * @param \phpbb\request\request $request
- * @param \phpbb\config\config $config
+ * @param \phpbb\request\request_interface $request
* @param string $phpbb_root_path Relative path to phpBB root
* @param string $php_ext PHP extension (php)
+ * @param mixed $adm_relative_path Relative path admin path to adm/ root
*/
- public function __construct(\phpbb\symfony_request $symfony_request, \phpbb\filesystem $filesystem, \phpbb\request\request $request, \phpbb\config\config $config, $phpbb_root_path, $php_ext, $adm_relative_path = null)
+ public function __construct(\phpbb\symfony_request $symfony_request, \phpbb\filesystem $filesystem, \phpbb\request\request_interface $request, $phpbb_root_path, $php_ext, $adm_relative_path = null)
{
$this->symfony_request = $symfony_request;
$this->filesystem = $filesystem;
$this->request = $request;
- $this->config = $config;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->adm_relative_path = $adm_relative_path;