summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/field_ui/field_ui.admin.inc2
-rw-r--r--modules/node/node.pages.inc4
-rw-r--r--modules/openid/openid.module4
-rw-r--r--modules/openid/openid.pages.inc2
-rw-r--r--modules/search/search.module4
-rw-r--r--modules/system/system.admin.inc4
-rw-r--r--modules/system/system.test8
-rw-r--r--modules/taxonomy/taxonomy.admin.inc7
-rw-r--r--modules/user/user.module2
-rw-r--r--modules/user/user.pages.inc12
10 files changed, 18 insertions, 31 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 6cdf699d4..9335ecc8a 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -540,7 +540,7 @@ function field_ui_field_overview_form_submit($form, &$form_state) {
if ($destinations) {
$destinations[] = urldecode(substr(drupal_get_destination(), 12));
- unset($_REQUEST['destination']);
+ unset($_GET['destination']);
$form_state['redirect'] = field_ui_get_destinations($destinations);
}
}
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index a0bbf92b0..e794fd0b2 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -301,9 +301,9 @@ function node_form($form, &$form_state, $node) {
*/
function node_form_delete_submit($form, &$form_state) {
$destination = '';
- if (isset($_REQUEST['destination'])) {
+ if (isset($_GET['destination'])) {
$destination = drupal_get_destination();
- unset($_REQUEST['destination']);
+ unset($_GET['destination']);
}
$node = $form['#node'];
$form_state['redirect'] = array('node/' . $node->nid . '/delete', $destination);
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';
}
diff --git a/modules/search/search.module b/modules/search/search.module
index 35b817d3f..9d15edb5e 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -917,8 +917,8 @@ function search_box_form_submit($form, &$form_state) {
// functionality, so we override any static destination set in the request,
// for example by drupal_access_denied() or drupal_not_found()
// (see http://drupal.org/node/292565).
- if (isset($_REQUEST['destination'])) {
- unset($_REQUEST['destination']);
+ if (isset($_GET['destination'])) {
+ unset($_GET['destination']);
}
$form_id = $form['form_id']['#value'];
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 48806cdb4..2d8c81713 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1822,7 +1822,7 @@ function system_site_maintenance_mode() {
* @ingroup forms
* @see system_settings_form()
*/
-function system_clean_url_settings($form) {
+function system_clean_url_settings($form, &$form_state) {
global $base_url;
// When accessing this form using a non-clean URL, allow a re-check to make
@@ -1852,7 +1852,7 @@ function system_clean_url_settings($form) {
else {
drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
- $form['#redirect'] = $base_url . '/admin/config/search/clean-urls';
+ $form_state['redirect'] = $base_url . '/admin/config/search/clean-urls';
$form['clean_url_description'] = array(
'#type' => 'markup',
'#markup' => '<p>' . t('Use URLs like <code>example.com/user</code> instead of <code>example.com/?q=user</code>.') . ' ' . t('If you are directed to a <em>Page not found (404)</em> error after testing for clean URLs, see the <a href="@handbook">online handbook</a>.', array('@handbook' => 'http://drupal.org/node/15365')) . '</p>',
diff --git a/modules/system/system.test b/modules/system/system.test
index d6fd1a98e..6d1e4d142 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -512,20 +512,14 @@ class AdminMetaTagTestCase extends DrupalWebTestCase {
class AccessDeniedTestCase extends DrupalWebTestCase {
protected $admin_user;
- /**
- * Implement getInfo().
- */
public static function getInfo() {
return array(
'name' => '403 functionality',
- 'description' => "Tests page access denied functionality, including custom 403 pages.",
+ 'description' => 'Tests page access denied functionality, including custom 403 pages.',
'group' => 'System'
);
}
- /**
- * Implement setUp().
- */
function setUp() {
parent::setUp();
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index ee32be4b0..b7cd4aba6 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -469,10 +469,7 @@ function taxonomy_overview_terms($form, &$form_state, $vocabulary) {
'#type' => 'submit',
'#value' => t('Reset to alphabetical')
);
- $form['destination'] = array(
- '#type' => 'hidden',
- '#value' => $_GET['q'] . (isset($_GET['page']) ? '?page=' . $_GET['page'] : '')
- );
+ $form_state['redirect'] = array($_GET['q'], (isset($_GET['page']) ? array('page' => $_GET['page']) : ''));
}
return $form;
@@ -780,7 +777,7 @@ function taxonomy_form_term($form, &$form_state, $vocabulary, $edit = array()) {
'#value' => $edit['tid']);
}
else {
- $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']);
+ $form_state['redirect'] = $_GET['q'];
}
return $form;
diff --git a/modules/user/user.module b/modules/user/user.module
index 9cb594c73..cf41f9d7e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3078,7 +3078,7 @@ function user_register($form, &$form_state) {
);
// Redirect back to page which initiated the create request;
// usually admin/people/create.
- $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']);
+ $form_state['redirect'] = $_GET['q'];
}
// Create a dummy variable for pass-by-reference parameters.
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index ac1115a80..80e00ae49 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -292,9 +292,9 @@ function user_profile_form_submit($form, &$form_state) {
*/
function user_edit_cancel_submit($form, &$form_state) {
$destination = '';
- if (isset($_REQUEST['destination'])) {
+ if (isset($_GET['destination'])) {
$destination = drupal_get_destination();
- unset($_REQUEST['destination']);
+ unset($_GET['destination']);
}
// Note: We redirect from user/uid/edit to user/uid/cancel to make the tabs disappear.
$form_state['redirect'] = array("user/" . $form_state['values']['_account']->uid . "/cancel", $destination);
@@ -391,9 +391,7 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
if (user_access('administer users') && empty($form_state['values']['user_cancel_confirm']) && $account->uid != $user->uid) {
user_cancel($form_state['values'], $account->uid, $form_state['values']['user_cancel_method']);
- if (!isset($_REQUEST['destination'])) {
- $form_state['redirect'] = 'admin/people';
- }
+ $form_state['redirect'] = 'admin/people';
}
else {
// Store cancelling method and whether to notify the user in $account for
@@ -407,9 +405,7 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
drupal_set_message(t('A confirmation request to cancel your account has been sent to your e-mail address.'));
watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
- if (!isset($_REQUEST['destination'])) {
- $form_state['redirect'] = "user/$account->uid";
- }
+ $form_state['redirect'] = "user/$account->uid";
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 06:15:09 +0000