diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2016-04-07 21:59:36 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-04-07 21:59:36 +0200 |
| commit | 901f36e982645efc6a778805cc592d80523f88d7 (patch) | |
| tree | cea81cf4280bdf67b10a42164ce51d5528710034 /phpBB/phpbb/controller | |
| parent | Merge pull request #4280 from Nicofuma/ticket/14198 (diff) | |
| parent | Merge branch 'ticket/13683' into ticket/13683-3.2.x (diff) | |
| download | phpbb-901f36e982645efc6a778805cc592d80523f88d7.tar.gz phpbb-901f36e982645efc6a778805cc592d80523f88d7.tar.bz2 phpbb-901f36e982645efc6a778805cc592d80523f88d7.zip | |
Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x
[ticket/13683] Respects force_server_vars settings when generating URLs
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 9dbc3737f7..664b4f4e0f 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -52,15 +52,15 @@ class helper protected $routing_helper; /** - * Constructor - * - * @param \phpbb\template\template $template Template object - * @param \phpbb\user $user User object - * @param \phpbb\config\config $config Config object - * @param \phpbb\symfony_request $symfony_request Symfony Request object - * @param \phpbb\request\request_interface $request phpBB request object - * @param \phpbb\routing\helper $routing_helper Helper to generate the routes - */ + * Constructor + * + * @param \phpbb\template\template $template Template object + * @param \phpbb\user $user User object + * @param \phpbb\config\config $config Config object + * @param \phpbb\symfony_request $symfony_request Symfony Request object + * @param \phpbb\request\request_interface $request phpBB request object + * @param \phpbb\routing\helper $routing_helper Helper to generate the routes + */ public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\routing\helper $routing_helper) { $this->template = $template; |