diff options
author | Dries Buytaert <dries@buytaert.net> | 2007-04-13 08:56:59 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2007-04-13 08:56:59 +0000 |
commit | e6759790919d06d807eeb5546841a5a09cf3a4d6 (patch) | |
tree | 4f6a88b11559f01d852262d03f42645568c820c0 /install.php | |
parent | be47ac090b3be5a13d33a75b835a755a0f4250c7 (diff) | |
download | brdo-e6759790919d06d807eeb5546841a5a09cf3a4d6.tar.gz brdo-e6759790919d06d807eeb5546841a5a09cf3a4d6.tar.bz2 |
- Patch #134493 by douggreen: getting the Drupal coding standards right in core. Woot. Woot.
Diffstat (limited to 'install.php')
-rw-r--r-- | install.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/install.php b/install.php index 003e68f65..1e7cbf240 100644 --- a/install.php +++ b/install.php @@ -336,7 +336,7 @@ function _install_settings_form_validate($db_prefix, $db_type, $db_user, $db_pas } else { // Verify - $db_url = $db_type .'://'. urlencode($db_user) .($db_pass ? ':'. urlencode($db_pass) : '') .'@'. ($db_host ? urlencode($db_host) : 'localhost'). ($db_port ? ":$db_port" : '') .'/'. urlencode($db_path); + $db_url = $db_type .'://'. urlencode($db_user) . ($db_pass ? ':'. urlencode($db_pass) : '') .'@'. ($db_host ? urlencode($db_host) : 'localhost') . ($db_port ? ":$db_port" : '') .'/'. urlencode($db_path); if (isset($form)) { form_set_value($form['_db_url'], $db_url); } @@ -465,7 +465,8 @@ function install_select_locale($profilename) { // Don't need to choose locale if only one (English) is available. if (sizeof($locales) == 1) { return FALSE; - } else { + } + else { foreach ($locales as $locale) { if ($_POST['locale'] == $locale->name) { return $locale->name; @@ -576,7 +577,7 @@ function install_complete($profile) { } else { // No more steps - $output .= '<p>' . (drupal_set_message() ? st('Please review the messages above before continuing on to <a href="@url">your new site</a>.', array('@url' => url(''))) : st('You may now visit <a href="@url">your new site</a>.', array('@url' => url('')))) . '</p>'; + $output .= '<p>'. (drupal_set_message() ? st('Please review the messages above before continuing on to <a href="@url">your new site</a>.', array('@url' => url(''))) : st('You may now visit <a href="@url">your new site</a>.', array('@url' => url('')))) .'</p>'; } // Output page. print theme('maintenance_page', $output); |