From d45a73777935c86fc5131955831833d7465b5e9d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 21 Jan 2013 01:22:01 -0500
Subject: Update copyright to 2013.  Fixes #1953.

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

(limited to 'installer/web.php')

diff --git a/installer/web.php b/installer/web.php
index 12f42d02..a7060bd8 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
-- 
cgit v1.2.3


From 7548266edf6d277527ba69153e7eadcf811bbb14 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 24 Jan 2013 22:35:56 -0500
Subject: Properly escape backslashes.  Fixes #1962.

---
 installer/web.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'installer/web.php')

diff --git a/installer/web.php b/installer/web.php
index a7060bd8..5fa8541e 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -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, "'`\\", "___");
       }
     }
 
-- 
cgit v1.2.3