From b3cac5c17320af380b18552a40ff809e598668cd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 31 Aug 2009 21:26:14 -0700
Subject: Suppress errors to mysql_connect().  We had this before, but it
 appears to have been accidentally removed in 177a854d

---
 installer/installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'installer')

diff --git a/installer/installer.php b/installer/installer.php
index fedb4251..7173a7ee 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -92,7 +92,7 @@ class installer {
       }
     }
 
-    return mysql_connect($config["host"], $config["user"], $config["password"]);
+    return @mysql_connect($config["host"], $config["user"], $config["password"]);
   }
 
   static function select_db($config) {
-- 
cgit v1.2.3


From e648ea4dbdb423e80d79ba9e4c9f3ebde6ed22a0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 31 Aug 2009 21:45:34 -0700
Subject: Escape single quotes in the password so that we don't break our
 config syntax.  Related to (but unclear that it fixes) ticket #650.

---
 installer/database_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'installer')

diff --git a/installer/database_config.php b/installer/database_config.php
index a31119ac..0f04b95c 100644
--- a/installer/database_config.php
+++ b/installer/database_config.php
@@ -31,7 +31,7 @@ $config['default'] = array(
   'connection'    => array(
     'type'     => '<?php print $type ?>',
     'user'     => '<?php print $user ?>',
-    'pass'     => '<?php print $password ?>',
+    'pass'     => '<?php print str_replace("'", "\\'", $password) ?>',
     'host'     => '<?php print $host ?>',
     'port'     => false,
     'socket'   => false,
-- 
cgit v1.2.3