Merged fix from stable

diff --git a/install.php b/install.php
index a11b28405a4e835393e6cf3158e69a9fd7d4af6b..51d73f03ae785ead66a168674fbef43a5d2e9e16 100644 (file)
--- a/install.php
+++ b/install.php
@@ -280,7 +280,7 @@ if ($nextstage == 5) {
     $str .= "\r\n";
 
     $str .= '$CFG->dbtype    = \''.$INSTALL['dbtype']."';\r\n";
-    $str .= '$CFG->dbhost    = \''.$INSTALL['dbhost']."';\r\n";
+    $str .= '$CFG->dbhost    = \''.addslashes($INSTALL['dbhost'])."';\r\n";
     if (!empty($INSTALL['dbname'])) {
         $str .= '$CFG->dbname    = \''.$INSTALL['dbname']."';\r\n";
         $str .= '$CFG->dbuser    = \''.$INSTALL['dbuser']."';\r\n";