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
This commit is contained in:
Andreas Fischer 2012-08-15 16:44:45 +02:00
commit ff8757ce65

View file

@ -23,37 +23,44 @@ if (!defined('IN_PHPBB'))
abstract class phpbb_extension_controller implements phpbb_extension_controller_interface abstract class phpbb_extension_controller implements phpbb_extension_controller_interface
{ {
/** /**
* @var phpbb_request Request class object * Request class object
* @var phpbb_request
*/ */
protected $request; protected $request;
/** /**
* @var dbal DBAL class object * DBAL class object
* @var dbal
*/ */
protected $db; protected $db;
/** /**
* @var user User class object * User class object
* @var phpbb_user
*/ */
protected $user; protected $user;
/** /**
* @var phpbb_template Template class object * Template class object
* @var phpbb_template
*/ */
protected $template; protected $template;
/** /**
* @var array Config array * Config object
* @var phpbb_config
*/ */
protected $config; protected $config;
/** /**
* @var string PHP Extension * PHP Extension
* @var string
*/ */
protected $php_ext; protected $php_ext;
/** /**
* @var string Relative path to board root * Relative path to board root
* @var string
*/ */
protected $phpbb_root_path; protected $phpbb_root_path;