diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
| commit | 28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch) | |
| tree | f022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/phpbb/controller | |
| parent | f8046cc2533f9f87eb914564c4e0e1215b0f007f (diff) | |
| parent | 2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff) | |
| download | forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2 forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12557] Fix load active module description
[ticket/12557] Fix php file description
[ticket/12557] Fix post data description for notifications
[ticket/12557] Fix pass by reference doc blocks
[ticket/12557] Fix doc block in extension base class
[ticket/12557] Fix doc block in mimetype guesser
[ticket/12557] Fix var $preserve_cr description
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Template fixes
[ticket/12557] Search, cron and profilefields fixes
[ticket/12557] Notification fixes
[ticket/12557] Fix doc block errors found by Sami pt1
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index e330fb5b6d..dd89d0504a 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -50,7 +50,7 @@ class helper protected $phpbb_root_path; /** - * PHP extension + * PHP file extension * @var string */ protected $php_ext; @@ -65,7 +65,7 @@ class helper * @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 + * @param string $php_ext PHP file extension */ 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) { @@ -82,9 +82,11 @@ class helper /** * Automate setting up the page and creating the response object. * - * @param string $handle The template handle to render + * @param string $template_file The template handle to render * @param string $page_title The title of the page to output * @param int $status_code The status code to be sent to the page header + * @param bool $display_online_list Do we display online users list + * * @return Response object containing rendered page */ public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false) |