1 files changed, 5 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc
index f9bcd88bf..d65917ab6 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -705,7 +705,11 @@ function drupal_redirect_form($form, $redirect = NULL) {
         call_user_func_array('drupal_goto', $goto);
       }
       else {
-        drupal_goto($goto);
+        // This function can be called from the installer, which guarantees
+        // that $redirect will always be a string, so catch that case here
+        // and use the appropriate redirect function.
+        $function = drupal_installation_attempted() ? 'install_goto' : 'drupal_goto';
+        $function($goto);
       }
     }
     drupal_goto($_GET['q']);