summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/form.inc3
-rw-r--r--modules/system.module2
-rw-r--r--modules/system/system.module2
3 files changed, 5 insertions, 2 deletions
diff --git a/includes/form.inc b/includes/form.inc
index 3e030ae1b..18ae0b145 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -126,6 +126,9 @@ function drupal_get_form($form_id, &$form, $callback = NULL) {
if (is_array($goto)) {
call_user_func_array('drupal_goto', $redirect);
}
+ elseif (!isset($goto)) {
+ drupal_goto($_GET['q']);
+ }
else {
drupal_goto($goto);
}
diff --git a/modules/system.module b/modules/system.module
index 6868f6cb6..d52197656 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -55,7 +55,7 @@ function system_perm() {
*/
function system_elements() {
// Top level form
- $type['form'] = array('#method' => 'post', '#action' => request_uri(), '#redirect' => $_GET['q']);
+ $type['form'] = array('#method' => 'post', '#action' => request_uri());
// Inputs
$type['checkbox'] = array('#input' => TRUE, '#return_value' => 1);
diff --git a/modules/system/system.module b/modules/system/system.module
index 6868f6cb6..d52197656 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -55,7 +55,7 @@ function system_perm() {
*/
function system_elements() {
// Top level form
- $type['form'] = array('#method' => 'post', '#action' => request_uri(), '#redirect' => $_GET['q']);
+ $type['form'] = array('#method' => 'post', '#action' => request_uri());
// Inputs
$type['checkbox'] = array('#input' => TRUE, '#return_value' => 1);