diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-08 18:10:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-08 18:10:01 +0200 |
| commit | 167c465dd224286e365f04c7738dbfcb78c64e5a (patch) | |
| tree | 165cb004e6d551886fefdc1c1a14704b353bf94c /phpBB/phpbb/controller/helper.php | |
| parent | b3d2898d0103de4d4521a1151731ad8206008a83 (diff) | |
| parent | 91f5d59f69f6257eed1bb86f43c35d614aa06533 (diff) | |
| download | forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar.gz forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar.bz2 forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar.xz forums-167c465dd224286e365f04c7738dbfcb78c64e5a.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12787] Updates phpbb_mock_controller_helper
[ticket/12787] Add controller_helper::get_current_url()
[ticket/12787] Remove one app.php when it's both in $path and $web_root_path
[ticket/12787] Fix the absolute board url
[ticket/12787] Use a parameter (_referer) instead of the Referer header
[ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
[ticket/12099] Remove config again
[ticket/12099] Correctly fix the path when performing AJAX requests
[ticket/12099] Add request argument to path_helper service
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 930bc42a98..e330fb5b6d 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -40,6 +40,9 @@ class helper */ protected $config; + /* @var \phpbb\symfony_request */ + protected $symfony_request; + /** * phpBB root path * @var string @@ -60,14 +63,16 @@ class helper * @param \phpbb\config\config $config Config object * @param \phpbb\controller\provider $provider Path provider * @param \phpbb\extension\manager $manager Extension manager object + * @param \phpbb\symfony_request $symfony_request Symfony Request object * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; $this->config = $config; + $this->symfony_request = $symfony_request; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $provider->find_routing_files($manager->get_finder()); @@ -151,4 +156,14 @@ class helper return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code); } + + /** + * Return the current url + * + * @return string + */ + public function get_current_url() + { + return generate_board_url(true) . $this->symfony_request->getRequestUri(); + } } |