summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/wizard.inc7
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9a60563..3ede2d5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,3 +19,4 @@ Add detach event to modal close so that wysiwyg can detach the editor.
Variant titles showing up as blank if more than one variant on a page.
#940016: token support was not yet updated for D7.
#940446: Skip validation on back and cancel buttons in all wizards.
+#954492: Redirect not always working in wizard.inc
diff --git a/includes/wizard.inc b/includes/wizard.inc
index 60f42fd..04570b7 100644
--- a/includes/wizard.inc
+++ b/includes/wizard.inc
@@ -191,7 +191,12 @@ function ctools_wizard_multistep_form($form_info, $step, &$form_state) {
if (empty($form_state['ajax'])) {
// redirect, if one is set.
if ($form_state['redirect']) {
- call_user_func_array('drupal_goto', $form_state['redirect']);
+ if (is_array($form_state['redirect'])) {
+ call_user_func_array('drupal_goto', $form_state['redirect']);
+ }
+ else {
+ drupal_goto($form_state['redirect']);
+ }
}
}
else if (isset($form_state['ajax next'])) {