From be0ffbc7dc61abc3a980c5fb82b77babd379c174 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 29 Aug 2014 06:17:01 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/lib/classes/db_mysql.inc.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index b96b8d0..bcf1b00 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -138,6 +138,7 @@
$chars = array(';', '#', '/*', '*/', '--', ' UNION ', '\\\'', '\\"');
$string = str_replace('\\\\', '', $string);
+ $string = preg_replace('/(^|[^\\\])([\'"])\\2/is', '$1', $string);
$string = preg_replace('/(^|[^\\\])([\'"])(.*?[^\\\])\\2/is', '$1', $string);
$ok = true;
--
Gitblit v1.9.1