diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-23 21:16:19 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-23 21:17:05 -0400 |
| commit | fe9c97cfb45be2943eebb8ed5cbab51150e828ee (patch) | |
| tree | 62b262e92c46170811bcea732319a4896a0ddb0e /phpBB/phpbb/auth/provider/oauth | |
| parent | c166801fe3f7a76484eee870aac19294d192c84c (diff) | |
| download | forums-fe9c97cfb45be2943eebb8ed5cbab51150e828ee.tar forums-fe9c97cfb45be2943eebb8ed5cbab51150e828ee.tar.gz forums-fe9c97cfb45be2943eebb8ed5cbab51150e828ee.tar.bz2 forums-fe9c97cfb45be2943eebb8ed5cbab51150e828ee.tar.xz forums-fe9c97cfb45be2943eebb8ed5cbab51150e828ee.zip | |
[feature/oauth] Fix errors in OAuth
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb/auth/provider/oauth')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/service/base.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/service/facebook.php | 11 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/service/google.php | 11 |
3 files changed, 21 insertions, 3 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php index d59199f987..ccfe57c8e2 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/base.php +++ b/phpBB/phpbb/auth/provider/oauth/service/base.php @@ -50,6 +50,6 @@ abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_prov */ public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider) { - $this->service_provider = $service; + $this->service_provider = $service_provider; } } diff --git a/phpBB/phpbb/auth/provider/oauth/service/facebook.php b/phpBB/phpbb/auth/provider/oauth/service/facebook.php index fcf41755b7..4758ae11f8 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/facebook.php +++ b/phpBB/phpbb/auth/provider/oauth/service/facebook.php @@ -30,13 +30,22 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau protected $config; /** + * phpBB request + * + * @var phpbb_request + */ + protected $request; + + /** * Constructor * * @param phpbb_config $config + * @param phpbb_request $request */ - public function __construct(phpbb_config $config) + public function __construct(phpbb_config $config, phpbb_request $request) { $this->config = $config; + $this->request = $request; } /** diff --git a/phpBB/phpbb/auth/provider/oauth/service/google.php b/phpBB/phpbb/auth/provider/oauth/service/google.php index 70bad77697..3e5735b97c 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/google.php +++ b/phpBB/phpbb/auth/provider/oauth/service/google.php @@ -30,13 +30,22 @@ class phpbb_auth_provider_oauth_service_google extends phpbb_auth_provider_oauth protected $config; /** + * phpBB request + * + * @var phpbb_request + */ + protected $request; + + /** * Constructor * * @param phpbb_config $config + * @param phpbb_request $request */ - public function __construct(phpbb_config $config) + public function __construct(phpbb_config $config, phpbb_request $request) { $this->config = $config; + $this->request = $request; } /** |