diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-28 20:32:08 +0100 | 
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-28 20:32:08 +0100 | 
| commit | 404768a607a3738bf6545c87eed53eec30204be9 (patch) | |
| tree | bdba9fc82ac2eabe09846fc448b9b287b1d36b90 | |
| parent | 1e67ffee1d5c2bec5d06acd574db949b58db0221 (diff) | |
| parent | e95e387188b050c163edcce3141c957d259810c9 (diff) | |
| download | forums-404768a607a3738bf6545c87eed53eec30204be9.tar forums-404768a607a3738bf6545c87eed53eec30204be9.tar.gz forums-404768a607a3738bf6545c87eed53eec30204be9.tar.bz2 forums-404768a607a3738bf6545c87eed53eec30204be9.tar.xz forums-404768a607a3738bf6545c87eed53eec30204be9.zip  | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 11 | 
1 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 0d94acfbca..e3f8394bba 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -216,10 +216,15 @@ class oauth extends \phpbb\auth\provider\base  			$this->service_providers[$service_name]->set_external_service_provider($service);  			$unique_id = $this->service_providers[$service_name]->perform_auth_login(); -			// Check to see if this provider is already assosciated with an account +			/** +			 * Check to see if this provider is already associated with an account. +			 * +			 * Enforcing a data type to make data contains strings and not integers, +			 * so values are quoted in the SQL WHERE statement. +			 */  			$data = array( -				'provider'	=> $service_name_original, -				'oauth_provider_id'	=> $unique_id +				'provider'			=> (string) $service_name_original, +				'oauth_provider_id'	=> (string) $unique_id  			);  			$sql = 'SELECT user_id FROM ' . $this->auth_provider_oauth_token_account_assoc . '  | 
