diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-08-31 22:56:11 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-08-31 22:56:11 -0600 |
| commit | 7b2c03c2b9d61ce945199505d8c2f273a84725b9 (patch) | |
| tree | 9af33753e5f9832f3640f475268b31b92f3c6862 /installer | |
| parent | 559f9a4b9d770a37048db73e82f84bc1f0ec09f1 (diff) | |
| parent | 5ca13fe5e83ec7d6dcc1f5d2ac19a3f4ebfc782c (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/database_config.php | 2 | ||||
| -rw-r--r-- | installer/installer.php | 2 |
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) { |