diff includes/bootstrap.inc @ 7:fff6d4c8c043 6.3

Drupal 6.3
author Franck Deroche <webmaster@defr.org>
date Tue, 23 Dec 2008 14:30:28 +0100
parents c1f4ac30525a
children 589fb7c02327
line wrap: on
line diff
--- a/includes/bootstrap.inc	Tue Dec 23 14:30:08 2008 +0100
+++ b/includes/bootstrap.inc	Tue Dec 23 14:30:28 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: bootstrap.inc,v 1.206.2.2 2008/02/11 14:36:21 goba Exp $
+// $Id: bootstrap.inc,v 1.206.2.3 2008/07/09 19:15:59 goba Exp $
 
 /**
  * @file
@@ -281,6 +281,11 @@
     include_once './'. conf_path() .'/settings.php';
   }
 
+  // Ignore the placeholder url from default.settings.php.
+  if (isset($db_url) && $db_url == 'mysql://username:password@localhost/databasename') {
+    $db_url = '';
+  }
+
   if (isset($base_url)) {
     // Parse fixed base URL from settings.php.
     $parts = parse_url($base_url);