From 94d54ebc29ea9f7dddc9963e47a7cb68fe053048 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 16 Jul 2015 18:45:59 +0200 Subject: [PATCH] Function declarations to match parent class --- lib/apignusocialoauthdatastore.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/apignusocialoauthdatastore.php b/lib/apignusocialoauthdatastore.php index da412df8d2..6f4403dec7 100644 --- a/lib/apignusocialoauthdatastore.php +++ b/lib/apignusocialoauthdatastore.php @@ -26,20 +26,20 @@ require_once 'OAuth.php'; */ class ApiGNUsocialOAuthDataStore extends OAuthDataStore { - function lookup_consumer($consumerKey) + function lookup_consumer($consumer_key) { - $con = Consumer::getKV('consumer_key', $consumerKey); + $con = Consumer::getKV('consumer_key', $consumer_key); if (!$con instanceof Consumer) { // Create an anon consumer and anon application if one // doesn't exist already - if ($consumerKey == 'anonymous') { + if ($consumer_key == 'anonymous') { common_debug("API OAuth - creating anonymous consumer"); $con = new Consumer(); - $con->consumer_key = $consumerKey; - $con->consumer_secret = $consumerKey; + $con->consumer_key = $consumer_key; + $con->consumer_secret = $consumer_key; $con->created = common_sql_now(); $result = $con->insert(); @@ -388,7 +388,7 @@ class ApiGNUsocialOAuthDataStore extends OAuthDataStore * * @return OAuthToken $token a new unauthorized OAuth request token */ - function new_request_token($consumer, $callback) + function new_request_token($consumer, $callback = null) { $t = new Token(); $t->consumer_key = $consumer->key; @@ -473,13 +473,13 @@ class ApiGNUsocialOAuthDataStore extends OAuthDataStore * @param type $token_key * @return OAuthToken */ - function lookup_token($consumer, $token_type, $token_key) + function lookup_token($consumer, $token_type, $token) { $t = new Token(); if (!is_null($consumer)) { $t->consumer_key = $consumer->key; } - $t->tok = $token_key; + $t->tok = $token; $t->type = ($token_type == 'access') ? 1 : 0; if ($t->find(true)) { return new OAuthToken($t->tok, $t->secret);