Merge commit 'upstream/master'

2 files changed, 2 insertions, 2 deletions

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,
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) {