summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-10-09 01:00:08 +0000
committerDries Buytaert <dries@buytaert.net>2009-10-09 01:00:08 +0000
commitc05f2181dc8556cb6700e8c6bb6e6ded43273192 (patch)
tree5446facb7f5f18dfaac48aade56c0d86f1477fff /install.php
parent48dd14a898420ae98984c951f59e8d299080bee8 (diff)
downloadbrdo-c05f2181dc8556cb6700e8c6bb6e6ded43273192.tar.gz
brdo-c05f2181dc8556cb6700e8c6bb6e6ded43273192.tar.bz2
- Patch #572618 by effulgentsia, pwolanin, sun: all theme functions should take a single argument. Code clean-up and performance improvement. Woot.
Diffstat (limited to 'install.php')
-rw-r--r--install.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/install.php b/install.php
index 2476e181a..83c5099ee 100644
--- a/install.php
+++ b/install.php
@@ -679,9 +679,9 @@ function install_display_output($output, $install_state) {
// Let the theming function know when every step of the installation has
// been completed.
$active_task = $install_state['installation_finished'] ? NULL : $install_state['active_task'];
- drupal_add_region_content('sidebar_first', theme_task_list(install_tasks_to_display($install_state), $active_task));
+ drupal_add_region_content('sidebar_first', theme('task_list', array('items' => install_tasks_to_display($install_state), 'active' => $active_task)));
}
- print theme($install_state['database_tables_exist'] ? 'maintenance_page' : 'install_page', $output);
+ print theme($install_state['database_tables_exist'] ? 'maintenance_page' : 'install_page', array('content' => $output));
exit;
}
@@ -708,7 +708,7 @@ function install_verify_requirements(&$install_state) {
if ($severity == REQUIREMENT_ERROR) {
if ($install_state['interactive']) {
drupal_set_title(st('Requirements problem'));
- $status_report = theme('status_report', $requirements);
+ $status_report = theme('status_report', array('requirements' => $requirements));
$status_report .= st('Check the error messages and <a href="!url">proceed with the installation</a>.', array('!url' => request_uri()));
return $status_report;
}
@@ -1025,7 +1025,8 @@ function install_select_profile(&$install_state) {
if ($install_state['interactive']) {
include_once DRUPAL_ROOT . '/includes/form.inc';
drupal_set_title(st('Select an installation profile'));
- return drupal_render(drupal_get_form('install_select_profile_form', $install_state['profiles']));
+ $form = drupal_get_form('install_select_profile_form', $install_state['profiles']);
+ return drupal_render($form);
}
else {
throw new Exception(install_no_profile_error());