diff options
| author | David King <imkingdavid@gmail.com> | 2013-01-18 14:00:40 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-15 09:18:06 -0400 |
| commit | 8c512b0d2d73a0930a420030dd6fecb8cb2d506f (patch) | |
| tree | 2a6a369a260c2dd7e41152dc76872bceaee0d7bf /phpBB/includes/controller | |
| parent | 02fd1811989d8a5171c06d9c3fa3b4746b131837 (diff) | |
| download | forums-8c512b0d2d73a0930a420030dd6fecb8cb2d506f.tar forums-8c512b0d2d73a0930a420030dd6fecb8cb2d506f.tar.gz forums-8c512b0d2d73a0930a420030dd6fecb8cb2d506f.tar.bz2 forums-8c512b0d2d73a0930a420030dd6fecb8cb2d506f.tar.xz forums-8c512b0d2d73a0930a420030dd6fecb8cb2d506f.zip | |
[ticket/11334] Properly generate controller URL until paths issue gets fixed
PHPBB3-11334
Diffstat (limited to 'phpBB/includes/controller')
| -rw-r--r-- | phpBB/includes/controller/helper.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php index 6cacc8fefa..2098f51edf 100644 --- a/phpBB/includes/controller/helper.php +++ b/phpBB/includes/controller/helper.php @@ -85,17 +85,14 @@ class phpbb_controller_helper } /** - * Easily generate a URL + * Generate a URL * - * @param array $url_parts Each array element is a 'folder' - * i.e. array('my', 'ext') maps to ./app.php/my/ext - * @param mixed $query The Query string, passed directly into the second - * argument of append_sid() - * @return string A URL that has already been run through append_sid() + * @param string $route The route to travel + * @return string The URL already passed through append_sid() */ - public function url(array $url_parts, $query = '') + protected function url($route) { - return append_sid($this->phpbb_root_path . implode('/', $url_parts), $query); + return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext, array('controller' => $route)); } /** |