voodoo changes

darcs-hash:20080618113720-84dde-4483d18751e7f82480c925cce4d1f84095598742.gz

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index e5c01c4637e80215cc999263f45a3396ec73bcb8..2b34b38ea2eb0f22ae69025e83fba094d630a487 100644 (file)
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -58,18 +58,18 @@ class FinishaddopenidAction extends Action {
                                $sreg = $sreg_resp->contents();
                        }
 
-                       $user = $this->get_user($canonical);
+                       $other = $this->get_user($canonical);
 
-                       if ($user) {
+                       if ($other) {
                                $this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"'));
                        } else {
-                               $user = common_current_user();
-                               if (!$this->connect_user($user, $display, $canonical)) {
+                               $cur = common_current_user();
+                               if (!$this->connect_user($cur, $display, $canonical)) {
                                        $this->message(_t('Error connecting user'));
                                        return;
                                }
                                if ($sreg) {
-                                       if (!$this->update_user($user, $sreg)) {
+                                       if (!$this->update_user($cur, $sreg)) {
                                                $this->message(_t('Error updating profile'));
                                                return;
                                        }
@@ -139,13 +139,17 @@ class FinishaddopenidAction extends Action {
 
        function connect_user($user, $display, $canonical) {
 
+               $id = $user->id;
+               
                $oid = new User_openid();
                $oid->display = $display;
                $oid->canonical = $canonical;
-               $oid->user_id = $user->id;
+               $oid->user_id = $id;
                $oid->created = DB_DataObject_Cast::dateTime();
-
-               if (!$oid->insert()) {
+               
+               $result = $oid->insert();
+               
+               if (!$result) {
                        $err = PEAR::getStaticProperty('DB_DataObject','lastError');
                        common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
                        return false;