summaryrefslogtreecommitdiff
path: root/includes/install.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-07-25 00:25:37 +0000
committerDries Buytaert <dries@buytaert.net>2010-07-25 00:25:37 +0000
commit03d7c314d8ba884843d3059cd7db58ce6ca903a0 (patch)
tree9eec9fa51920a7ce1854d0fc696ebed453d4dba7 /includes/install.inc
parenta3037d90c07239e4a7c8d5a3a19016c2ac377de2 (diff)
downloadbrdo-03d7c314d8ba884843d3059cd7db58ce6ca903a0.tar.gz
brdo-03d7c314d8ba884843d3059cd7db58ce6ca903a0.tar.bz2
- Patch #641008 by reglogge, David_Rothstein, tstoeckler, marcvangend: duplicated text in install error message.
Diffstat (limited to 'includes/install.inc')
-rw-r--r--includes/install.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/install.inc b/includes/install.inc
index cefbcc1f2..08d1a2ccd 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -394,7 +394,7 @@ 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.<ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/getting-started/install">installation handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name())));
+ $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', array('%error' => $e->getMessage(), '%name' => $this->name())));
return FALSE;
}
return TRUE;