diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-15 16:44:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-15 16:44:45 +0200 |
| commit | ff8757ce65fcf24f63c849d914e6165fccb0e6c4 (patch) | |
| tree | 51dd3d08cfc14cf8be4cde93796445fa1629dd69 | |
| parent | 64ff06cf872cef6c41b230967ac054eae7d005b9 (diff) | |
| parent | b729609fb29ba653b168a8bcb2e071e3bd72dda6 (diff) | |
| download | forums-ff8757ce65fcf24f63c849d914e6165fccb0e6c4.tar forums-ff8757ce65fcf24f63c849d914e6165fccb0e6c4.tar.gz forums-ff8757ce65fcf24f63c849d914e6165fccb0e6c4.tar.bz2 forums-ff8757ce65fcf24f63c849d914e6165fccb0e6c4.tar.xz forums-ff8757ce65fcf24f63c849d914e6165fccb0e6c4.zip | |
Merge remote-tracking branch 'imkingdavid/ticket/11054' into develop
* imkingdavid/ticket/11054:
[ticket/11054] Fixed $config var description
[ticket/11054] The user class is phpbb_user
[ticket/11054] Fixed documentation syntax for @var in extension/controller.php
| -rw-r--r-- | phpBB/includes/extension/controller.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index 2b8c50aafb..f97b69c7ed 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -23,37 +23,44 @@ if (!defined('IN_PHPBB')) abstract class phpbb_extension_controller implements phpbb_extension_controller_interface { /** - * @var phpbb_request Request class object + * Request class object + * @var phpbb_request */ protected $request; /** - * @var dbal DBAL class object + * DBAL class object + * @var dbal */ protected $db; /** - * @var user User class object + * User class object + * @var phpbb_user */ protected $user; /** - * @var phpbb_template Template class object + * Template class object + * @var phpbb_template */ protected $template; /** - * @var array Config array + * Config object + * @var phpbb_config */ protected $config; /** - * @var string PHP Extension + * PHP Extension + * @var string */ protected $php_ext; /** - * @var string Relative path to board root + * Relative path to board root + * @var string */ protected $phpbb_root_path; |