diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-15 13:54:41 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-16 17:05:45 -0500 |
| commit | b4eff4f06acce78536a392b733f2438f4d1d1c52 (patch) | |
| tree | 567adee1783440bb76fc778447249b752563aa82 /phpBB/includes/controller | |
| parent | aead33432ae67857009f9570a5ec720d86f7575b (diff) | |
| download | forums-b4eff4f06acce78536a392b733f2438f4d1d1c52.tar forums-b4eff4f06acce78536a392b733f2438f4d1d1c52.tar.gz forums-b4eff4f06acce78536a392b733f2438f4d1d1c52.tar.bz2 forums-b4eff4f06acce78536a392b733f2438f4d1d1c52.tar.xz forums-b4eff4f06acce78536a392b733f2438f4d1d1c52.zip | |
[feature/controller] Remove URL Base from helper class
I had forgotten that the container sends the same instance of objects to all
services that request it, so in this case all controllers would share the same
base url path, which is not desired.
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/controller')
| -rw-r--r-- | phpBB/includes/controller/helper.php | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php index 8bb4427382..6b697c7e46 100644 --- a/phpBB/includes/controller/helper.php +++ b/phpBB/includes/controller/helper.php @@ -48,12 +48,6 @@ class phpbb_controller_helper protected $php_ext; /** - * Base URL - * @var array - */ - protected $url_base; - - /** * Constructor * * @param phpbb_template $template Template object @@ -101,21 +95,7 @@ class phpbb_controller_helper */ public function url(array $url_parts, $query = '') { - return append_sid($this->root_path . $this->url_base . implode('/', $url_parts), $query); - } - - /** - * Set base to prepend to urls generated by url() - * This allows extensions to have a certain 'directory' under which - * all their pages are served, but not have to type it every time - * - * @param array $url_parts Each array element is a 'folder' - * i.e. array('my', 'ext') maps to ./app.php/my/ext - * @return null - */ - public function set_url_base(array $url_parts) - { - $this->url_base = !empty($url_parts) ? implode('/', $url_parts) . '/' : ''; + return append_sid($this->root_path . implode('/', $url_parts), $query); } /** |