--- openid-dev/openid.module Wed Jan 30 22:43:20 2008 +++ openid-dev-patched/openid.module Thu Mar 13 20:01:10 2008 @@ -369,7 +369,7 @@ $delegate = _openid_link_href('openid2.local_id', $result->data); $version = 2; - // 1.0 links + // 1.1 links if (empty($uri)) { $uri = _openid_link_href('openid.server', $result->data); $delegate = _openid_link_href('openid.delegate', $result->data); @@ -514,21 +514,23 @@ global $base_url; include_once drupal_get_path('module', 'openid') .'/openid.inc'; - $ns = ($version == 2) ? OPENID_NS_2_0 : OPENID_NS_1_0; $request = array( - 'openid.ns' => $ns, 'openid.mode' => 'checkid_setup', 'openid.identity' => $identity, - 'openid.claimed_id' => $claimed_id, - 'openid.assoc_handle' => $assoc_handle, 'openid.return_to' => $return_to, ); + if (strlen($assoc_handle) != 0) { + $request['openid.assoc_handle'] = $assoc_handle; + } + if ($version == 2) { + $request['openid.ns'] = OPENID_NS_2_0; + $request['openid.claimed_id'] = $claimed_id; $request['openid.realm'] = url('', NULL, NULL, TRUE); } else { - $request['openid.trust_root'] = $realm; + $request['openid.trust_root'] = $return_to; } // Simple Registration