Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 3 insertions, 3 deletions

diff --git a/installer/web.php b/installer/web.php
index 12f42d02..5fa8541e 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2012 Bharat Mediratta
+ * Copyright (C) 2000-2013 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,9 +41,9 @@ if (installer::already_installed()) {
     list ($config["host"], $config["port"]) = explode(":", $config["host"] . ":");
     foreach ($config as $k => $v) {
       if ($k == "password") {
-        $config[$k] = str_replace("'", "\\'", $v);
+        $config[$k] = str_replace(array("'", "\\"), array("\\'", "\\\\"), $v);
       } else {
-        $config[$k] = strtr($v, "'`", "__");
+        $config[$k] = strtr($v, "'`\\", "___");
       }
     }