aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/convertors
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2015-01-14 12:34:28 +0100
committerTristan Darricau <github@nicofuma.fr>2015-01-14 12:34:28 +0100
commit98937a7a18dc605c6d3bb8a3f20f124ec71e058a (patch)
tree188b7b5c0741a7fd5ea54d322b9f394a21c1fe28 /phpBB/install/convertors
parent853733a0eb04f917fe3195ed9f36cfcf643deffd (diff)
parentb5544b2f471ce4c93b08d19919ab062725545ce8 (diff)
downloadforums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.gz
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.bz2
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.xz
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.zip
Merge pull request #3289 from MGaetan89/ticket/13450
[ticket/13450] Type-hint return value of $phpbb_container->get() * MGaetan89/ticket/13450: [ticket/13450] Type-hint return value of $phpbb_container->get()
Diffstat (limited to 'phpBB/install/convertors')
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 7794b5ca67..089c569280 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1974,6 +1974,7 @@ function phpbb_convert_password_hash($hash)
{
global $phpbb_container;
+ /* @var $manager \phpbb\passwords\manager */
$manager = $phpbb_container->get('passwords.manager');
$hash = $manager->hash($hash, '$H$');