Index: includes/install.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.inc,v
retrieving revision 1.137
diff -u -p -r1.137 install.inc
--- includes/install.inc 22 Jul 2010 23:54:32 -0000 1.137
+++ includes/install.inc 23 Jul 2010 14:33:40 -0000
@@ -394,10 +394,10 @@ abstract class DatabaseTasks {
$this->pass('Drupal can CONNECT to the database ok.');
}
catch (Exception $e) {
- $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.
- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
For more help, see the installation handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name())));
- return FALSE;
- }
- return TRUE;
+ $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.- Is the database server running?
- Does the database exist and have you entered the correct database name?
- Have you entered the correct username and password?
- Have you entered the correct database hostname?
', array('%error' => $e->getMessage(), '%name' => $this->name())));
+ return FALSE;
+ }
+ return TRUE;
}