more debugging output, better check on canonical

darcs-hash:20080618162715-84dde-9a3213796a88cf4f28597553e1834896c7f201a7.gz

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 35b82ddf9271182da51ee0773e8333f10085c90e..43500acc306934567c6e7ca18bba9679047cf8e6 100644 (file)
--- 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,6 +58,7 @@ class FinishaddopenidAction extends Action {
                                $sreg = $sreg_resp->contents();
                        }
 
+                       common_debug(print_r($response, TRUE), __FILE__);
                        common_debug(print_r($sreg, TRUE), __FILE__);
                        common_debug(print_r($display, TRUE), __FILE__);
                        common_debug(print_r($canonical, TRUE), __FILE__);