From 1d87d80fb9eb9a2712e90726a89048f7c03c5995 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 01 Jul 2016 07:41:57 -0400
Subject: [PATCH] Merge branch 'patch-3' into 'stable-3.1'
---
interface/lib/classes/remoting_lib.inc.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 9ee3ca5..e697810 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -98,6 +98,7 @@
unset($form);
$this->dateformat = $app->lng('conf_format_dateshort');
+ $this->datetimeformat = $app->lng('conf_format_datetime');
return true;
}
@@ -243,9 +244,9 @@
if($key == '#OFFSET#') $sql_offset = $app->functions->intval($val);
elseif($key == '#LIMIT#') $sql_limit = $app->functions->intval($val);
elseif(stristr($val, '%')) {
- $sql_where .= "? like ? AND ";
+ $sql_where .= "?? like ? AND ";
} else {
- $sql_where .= "? = ? AND ";
+ $sql_where .= "?? = ? AND ";
}
$params[] = $key;
$params[] = $val;
--
Gitblit v1.9.1