From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
---
interface/web/monitor/datalog_list.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/monitor/datalog_list.php b/interface/web/monitor/datalog_list.php
index 82ab334..6f4766e 100644
--- a/interface/web/monitor/datalog_list.php
+++ b/interface/web/monitor/datalog_list.php
@@ -49,8 +49,8 @@
$servers = $app->db->queryAllRecords("SELECT server_id, updated FROM server");
$sql = '(';
-foreach($servers as $s) {
- $sql .= " (datalog_id > ".$s['updated']." AND server_id = ".$s['server_id'].") AND ";
+foreach($servers as $sv) {
+ $sql .= " (datalog_id > ".$sv['updated']." AND sys_datalog.server_id = ".$sv['server_id'].") OR ";
}
$sql = substr($sql,0,-4);
$sql .= ')';
--
Gitblit v1.9.1