diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-23 07:50:28 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-23 07:50:28 +0000 |
| commit | b1026a1a21f689cafedc0408a3174edb61f85ee2 (patch) | |
| tree | a0c8efad301621f6c47d179b2aff82c85a33f072 /includes/install.core.inc | |
| parent | 57fe6927a05c565ac5e2b61dcf9fe82da6614872 (diff) | |
| download | brdo-b1026a1a21f689cafedc0408a3174edb61f85ee2.tar.gz brdo-b1026a1a21f689cafedc0408a3174edb61f85ee2.tar.bz2 | |
#776178 follow-up by David_Rothstein: Fixed PHP 5.3 warning for command line install at the root, rather than the symptom.
Diffstat (limited to 'includes/install.core.inc')
| -rw-r--r-- | includes/install.core.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/includes/install.core.inc b/includes/install.core.inc index 97f9ba593..5078f76c9 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -406,8 +406,14 @@ function install_run_task($task, &$install_state) { // For non-interactive forms, submit the form programmatically with the // values taken from the installation state. Throw an exception if any // errors were encountered. - $form_state = array('values' => !empty($install_state['forms'][$function]) ? $install_state['forms'][$function] : array()); - drupal_form_submit($function, $form_state, $install_state); + $form_state = array( + 'values' => !empty($install_state['forms'][$function]) ? $install_state['forms'][$function] : array(), + // We need to pass $install_state by reference in order for forms to + // modify it, since the form API will use it in call_user_func_array(), + // which requires that referenced variables be passed explicitly. + 'build_info' => array('args' => array(&$install_state)), + ); + drupal_form_submit($function, $form_state); $errors = form_get_errors(); if (!empty($errors)) { throw new Exception(implode("\n", $errors)); @@ -1392,7 +1398,7 @@ function install_import_locales(&$install_state) { * @return * The form API definition for the site configuration form. */ -function install_configure_form($form, &$form_state, $install_state) { +function install_configure_form($form, &$form_state, &$install_state) { if (variable_get('site_name', FALSE) || variable_get('site_mail', FALSE)) { // Site already configured: This should never happen, means re-running the // installer, possibly by an attacker after the 'install_task' variable got @@ -1583,7 +1589,7 @@ function install_check_requirements($install_state) { /** * Forms API array definition for site configuration. */ -function _install_configure_form($form, &$form_state, $install_state) { +function _install_configure_form($form, &$form_state, &$install_state) { include_once DRUPAL_ROOT . '/includes/locale.inc'; $form['site_information'] = array( |