? 621956-13_openid_provider_form.patch
? 621956-7_openid_provider_form.patch
Index: openid_provider.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openid_provider/openid_provider.inc,v
retrieving revision 1.3.2.7
diff -u -p -r1.3.2.7 openid_provider.inc
--- openid_provider.inc	15 Feb 2010 21:13:15 -0000	1.3.2.7
+++ openid_provider.inc	2 Mar 2010 15:29:04 -0000
@@ -142,6 +142,9 @@ function openid_provider_authentication_
     return openid_redirect_http($response['openid.return_to'], $response); 
   }
   else {
+    // Unset global post variable, otherwise FAPI will assume it has been 
+    // submitted against openid_provider_form.
+    unset($_POST);
     return drupal_get_form('openid_provider_form', $response, $realm);
   }
 }
Index: openid_provider.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openid_provider/openid_provider.module,v
retrieving revision 1.3.2.4
diff -u -p -r1.3.2.4 openid_provider.module
--- openid_provider.module	15 Feb 2010 21:13:15 -0000	1.3.2.4
+++ openid_provider.module	2 Mar 2010 15:29:04 -0000
@@ -221,16 +221,18 @@ function openid_provider_form(&$form_sta
   else {
     $realm = $form_state['storage']['realm'];
   }
-  
+
   $form = array();
-  
+
+  // Force FAPI to cache this form so that $form_state['storage'] is available
+  // in submit handler.
+  $form['#cache'] = TRUE;
+  $form['#action'] = url('openid/provider/send');
+
   $form['intro'] = array(
     '#type' => 'markup',
     '#value' => '<p>'. t('You are being logged into %site, would you like to continue?', array('%site' => $realm)) .'</p>'
   );
-  
-  $form['#action'] = url('openid/provider/send');
-
   $form['submit_once'] = array(
     '#type' => 'submit',
     '#value' => t('Yes; just this once'),
@@ -331,4 +333,4 @@ function openid_provider_pathauto_bulkup
   drupal_set_message(format_plural($count,
     'Bulk generation of OpenID Provider paths completed, one alias generated.',
     'Bulk generation of OpenID Provider paths completed, @count aliases generated.'));
-}
\ No newline at end of file
+}