diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-22 15:15:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-22 15:15:09 +0200 |
| commit | eba5b59533e1e46aff01542c913920d699075524 (patch) | |
| tree | 95d413d224b771d6753ac30e739c0fc574d20977 /phpBB/phpbb | |
| parent | 6381c5a7310e2046fc3e4d1755b20b75a321b8e9 (diff) | |
| parent | 552f35952aaf992157e62148ae571bf2ab899c4a (diff) | |
| download | forums-eba5b59533e1e46aff01542c913920d699075524.tar forums-eba5b59533e1e46aff01542c913920d699075524.tar.gz forums-eba5b59533e1e46aff01542c913920d699075524.tar.bz2 forums-eba5b59533e1e46aff01542c913920d699075524.tar.xz forums-eba5b59533e1e46aff01542c913920d699075524.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/passwords/manager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php index fbb49d86a0..aa9147ecf4 100644 --- a/phpBB/phpbb/passwords/manager.php +++ b/phpBB/phpbb/passwords/manager.php @@ -56,7 +56,7 @@ class manager * @param array $hashing_algorithms Hashing driver * service collection * @param \phpbb\passwords\helper $helper Passwords helper object - * @param string $defaults List of default driver types + * @param array $defaults List of default driver types */ public function __construct(\phpbb\config\config $config, $hashing_algorithms, helper $helper, $defaults) { |