From ee8aa910b9db2f90bfb46ba852eaa349343d5e04 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 21 Sep 2009 06:44:14 +0000
Subject: Patch #579366 by sun, litwol | chx, Dries: simplified form API
 redirection handling. I can actually understand it now. ;-).

---
 modules/openid/openid.module    | 4 ++--
 modules/openid/openid.pages.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/openid')

diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 0facb8ebd..61edf053a 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -445,7 +445,7 @@ function openid_authentication($response) {
       $_SESSION['openid']['values'] = $form_state['values'];
       // We'll want to redirect back to the same place.
       $destination = drupal_get_destination();
-      unset($_REQUEST['destination']);
+      unset($_GET['destination']);
       drupal_goto('user/register', $destination);
     }
     else {
@@ -463,7 +463,7 @@ function openid_authentication($response) {
       // Let other modules act on OpenID login
       module_invoke_all('openid_response', $response, $account);
     }
-    drupal_redirect_form($form, $form_state['redirect']);
+    drupal_redirect_form($form_state);
   }
   else {
     drupal_set_message(t('Only site administrators can create new user accounts.'), 'error');
diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc
index b900c413c..0091e33fa 100644
--- a/modules/openid/openid.pages.inc
+++ b/modules/openid/openid.pages.inc
@@ -111,5 +111,5 @@ function openid_user_delete_form_submit($form, &$form_state) {
   if ($query) {
     drupal_set_message(t('OpenID deleted.'));
   }
-  $form_state['#redirect'] = 'user/' . $form_state['args'][0]->uid . '/openid';
+  $form_state['redirect'] = 'user/' . $form_state['args'][0]->uid . '/openid';
 }
-- 
cgit v1.2.3