diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-16 14:36:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-16 15:07:24 +0200 |
| commit | 1cbc6dedab1e5d02872d9ed185125383abd96de1 (patch) | |
| tree | dabff3548cd55d9f91f6131ac680cd33745b479d /phpBB/phpbb/extension/metadata_manager.php | |
| parent | 82e1b8fd726c3d8dda86faf994c6ca3533462e89 (diff) | |
| parent | 7b2ffaf78c9f591d1b68e650918a59cc436adecf (diff) | |
| download | forums-1cbc6dedab1e5d02872d9ed185125383abd96de1.tar forums-1cbc6dedab1e5d02872d9ed185125383abd96de1.tar.gz forums-1cbc6dedab1e5d02872d9ed185125383abd96de1.tar.bz2 forums-1cbc6dedab1e5d02872d9ed185125383abd96de1.tar.xz forums-1cbc6dedab1e5d02872d9ed185125383abd96de1.zip | |
Merge pull request #4592 from javiexin/ticket/14938
[ticket/14938] Inconsistency in ext_mgr all_available vs is_available
Diffstat (limited to 'phpBB/phpbb/extension/metadata_manager.php')
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 0842c5d7ae..4059491663 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -66,17 +66,18 @@ class metadata_manager */ protected $metadata_file; + // @codingStandardsIgnoreStart /** * Creates the metadata manager * * @param string $ext_name Name (including vendor) of the extension * @param \phpbb\config\config $config phpBB Config instance * @param \phpbb\extension\manager $extension_manager An instance of the phpBB extension manager - * @param \phpbb\template\template $template phpBB Template instance + * @param \phpbb\template\template $template phpBB Template instance or null * @param \phpbb\user $user User instance * @param string $phpbb_root_path Path to the phpbb includes directory. */ - public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template, \phpbb\user $user, $phpbb_root_path) + public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template = null, \phpbb\user $user, $phpbb_root_path) { $this->config = $config; $this->extension_manager = $extension_manager; @@ -88,6 +89,7 @@ class metadata_manager $this->metadata = array(); $this->metadata_file = ''; } + // @codingStandardsIgnoreEnd /** * Processes and gets the metadata requested |