diff options
author | David King <imkingdavid@gmail.com> | 2012-11-16 10:37:07 -0500 |
---|---|---|
committer | David King <imkingdavid@gmail.com> | 2012-11-16 17:05:59 -0500 |
commit | d41b1146e8947919ed9bdd41e6a30ad15e91d262 (patch) | |
tree | 95a3bdea6debe3d2ee18027548d5196ab5f54579 /phpBB/includes/controller | |
parent | c2f352ab3550dd5eed1aa425b720bd0cdf8d6859 (diff) | |
download | forums-d41b1146e8947919ed9bdd41e6a30ad15e91d262.tar forums-d41b1146e8947919ed9bdd41e6a30ad15e91d262.tar.gz forums-d41b1146e8947919ed9bdd41e6a30ad15e91d262.tar.bz2 forums-d41b1146e8947919ed9bdd41e6a30ad15e91d262.tar.xz forums-d41b1146e8947919ed9bdd41e6a30ad15e91d262.zip |
[feature/controller] Rename $root_path class property to $phpbb_root_path
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/controller')
-rw-r--r-- | phpBB/includes/controller/helper.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php index 6b697c7e46..6dc3ec4626 100644 --- a/phpBB/includes/controller/helper.php +++ b/phpBB/includes/controller/helper.php @@ -39,7 +39,7 @@ class phpbb_controller_helper * phpBB root path * @var string */ - protected $root_path; + protected $phpbb_root_path; /** * PHP extension @@ -52,14 +52,14 @@ class phpbb_controller_helper * * @param phpbb_template $template Template object * @param phpbb_user $user User object - * @param string $root_path phpBB root path + * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_template $template, phpbb_user $user, $root_path, $php_ext) + public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; - $this->root_path = $root_path; + $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; } @@ -95,7 +95,7 @@ class phpbb_controller_helper */ public function url(array $url_parts, $query = '') { - return append_sid($this->root_path . implode('/', $url_parts), $query); + return append_sid($this->phpbb_root_path . implode('/', $url_parts), $query); } /** |