[geeklog-hg] geeklog: Removed unused variable

[geeklog-cvs at lists.geeklog.net]

changeset 9221:bb744e3c28b8
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bb744e3c28b8
user: Tom <websitemaster at cogeco.net>
date: Sun Jul 21 10:40:26 2013 -0400
description:
Removed unused variable

diffstat:

 system/classes/oauthhelper.class.php |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 7c077e952889 -r bb744e3c28b8 system/classes/oauthhelper.class.php
--- a/system/classes/oauthhelper.class.php	Sat Jul 20 20:45:44 2013 -0400
+++ b/system/classes/oauthhelper.class.php	Sun Jul 21 10:40:26 2013 -0400
@@ -39,6 +39,7 @@
 require_once 'http/http.php';
 require_once 'oauth/oauth_client.php';
 
+// Enable to show debug info for OAuth
 $_SYSTEM['debug_oauth'] = false;
 
 class OAuthConsumer {
@@ -158,7 +159,7 @@
     }
 
     public function doAction($info) {
-        global $_TABLES, $status, $uid, $_CONF, $checkMerge;
+        global $_TABLES, $status, $uid, $_CONF;
 
         // remote auth precludes usersubmission, and integrates user activation
         $status = USER_ACCOUNT_ACTIVE;
@@ -174,7 +175,6 @@
 
         if (empty($tmp) && $nrows == 1) {
             list($uid, $status) = DB_fetchArray($result);
-            $checkMerge = false;
         } else {
             // initial login - create account
             $status = USER_ACCOUNT_ACTIVE;
@@ -201,7 +201,6 @@
 
             $remote_grp = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Remote Users'");
             DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid) VALUES ($remote_grp, $uid)");
-            $checkMerge = true;
         }
     }