diff options
author | Marc Alexander <admin@m-a-styles.de> | 2014-10-30 13:58:09 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-01 21:54:06 +0100 |
commit | 6b057e026cfb9603c6260d619e0a37e3679aa0d5 (patch) | |
tree | 451b790fca760baa5d29fcd6068e135ca8d9a56e /phpBB/phpbb/auth/auth.php | |
parent | f3588c66ec22b71e779da1497a690802e1c6b51a (diff) | |
download | forums-6b057e026cfb9603c6260d619e0a37e3679aa0d5.tar forums-6b057e026cfb9603c6260d619e0a37e3679aa0d5.tar.gz forums-6b057e026cfb9603c6260d619e0a37e3679aa0d5.tar.bz2 forums-6b057e026cfb9603c6260d619e0a37e3679aa0d5.tar.xz forums-6b057e026cfb9603c6260d619e0a37e3679aa0d5.zip |
[ticket/13248] Use auth provider collection for getting provider
PHPBB3-13248
Diffstat (limited to 'phpBB/phpbb/auth/auth.php')
-rw-r--r-- | phpBB/phpbb/auth/auth.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 38755ccf99..b59f0e60ec 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -927,11 +927,11 @@ class auth */ function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0) { - global $config, $db, $user, $phpbb_root_path, $phpEx, $phpbb_container; + global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container; - $method = trim(basename($config['auth_method'])); + $provider_collection = $phpbb_container->get('auth.provider_collection'); - $provider = $phpbb_container->get('auth.provider.' . $method); + $provider = $provider_collection->get_provider(); if ($provider) { $login = $provider->login($username, $password); |