Index: modules/openid/openid.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v
retrieving revision 1.19.2.5
diff -u -9 -p -r1.19.2.5 openid.module
--- modules/openid/openid.module	30 Mar 2009 11:36:47 -0000	1.19.2.5
+++ modules/openid/openid.module	10 Jun 2009 20:31:53 -0000
@@ -446,29 +446,28 @@ function openid_association_request($pub
     $request['openid.dh_consumer_public'] = $cpub;
   }
 
   return $request;
 }
 
 function openid_authentication_request($claimed_id, $identity, $return_to = '', $assoc_handle = '', $version = 2) {
   module_load_include('inc', 'openid');
 
-  $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 ($version == 2) {
+    $request['openid.ns'] = OPENID_NS_2_0;
+    $request['openid.claimed_id'] = $claimed_id;
     $request['openid.realm'] = url('', array('absolute' => TRUE));
   }
   else {
     $request['openid.trust_root'] = url('', array('absolute' => TRUE));
   }
 
   // Simple Registration
   $request['openid.sreg.required'] = 'nickname,email';
   $request['openid.ns.sreg'] = "http://openid.net/extensions/sreg/1.1";