X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffinishaddopenid.php;h=4f167e9efc9e002c68f0cb90d7b45ad9fc2d1eae;hb=0ee3b6c57fd92c6f5a44e56c5b73c6b5bf06214e;hp=97afc1471692a3a5ae55c580f35b1d790cc6e1b7;hpb=c3adb121ecbd59bdb0a2cb272805f35cd3bc9082;p=quix0rs-gnu-social.git

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 97afc14716..4f167e9efc 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -49,8 +49,8 @@ class FinishaddopenidAction extends Action {
 			// identity URL and Simple Registration data (if it was
 			// returned).
 			$display = $response->getDisplayIdentifier();
-			$canonical = ($response->endpoint->canonicalID) ?
-			  $response->endpoint->canonicalID : $response->getDisplayIdentifier();
+			$canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
+			  $response->endpoint->canonicalID : $display;
 
 			$sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
 
@@ -58,10 +58,15 @@ class FinishaddopenidAction extends Action {
 				$sreg = $sreg_resp->contents();
 			}
 
+			common_debug('response = ' .print_r($response, TRUE), __FILE__);
+			common_debug('sreg = ' .print_r($sreg, TRUE), __FILE__);
+			common_debug('display = ' .print_r($display, TRUE), __FILE__);
+			common_debug('canonical = ' .print_r($canonical, TRUE), __FILE__);
+			
 			$other =& $this->get_user($canonical);
 
 			if ($other) {
-				$this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"'));
+				$this->message(_t('This OpenID is already associated with user "') . $other->nickname . _t('"'));
 			} else {
 				$cur =& common_current_user();
 				$result = oid_link_user($cur->id, $display, $canonical);