From 3f4a01012585d38f127cb5dd5e4c8feed7fabac7 Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 13 May 2015 18:42:51 +0100 Subject: [PATCH 1/2] Fixed query which caused issues when no devices_perms existed --- html/includes/table/devices.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/html/includes/table/devices.inc.php b/html/includes/table/devices.inc.php index 462289285..dd5e36c03 100644 --- a/html/includes/table/devices.inc.php +++ b/html/includes/table/devices.inc.php @@ -3,10 +3,11 @@ $where = 1; $param = array(); -$sql = " FROM `devices`, `devices_perms` AS `DP`"; +$sql = " FROM `devices`"; if (is_admin() === FALSE && is_read() === FALSE) { - $where .= " AND `devices`.`device_id`=`DP`.`device_id` AND `DP`.`user_id`=?"; + $sql .= " LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`"; + $where .= " AND (`devices`.`device_id`=`DP`.`device_id` AND `DP`.`user_id`=?)"; $param[] = $_SESSION['user_id']; } From 189391d7bb1a9beeb23f186a12441e524617d19e Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 13 May 2015 18:58:15 +0100 Subject: [PATCH 2/2] Removed duplicated query --- html/includes/table/devices.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/includes/table/devices.inc.php b/html/includes/table/devices.inc.php index dd5e36c03..f0aebfb58 100644 --- a/html/includes/table/devices.inc.php +++ b/html/includes/table/devices.inc.php @@ -7,7 +7,7 @@ $sql = " FROM `devices`"; if (is_admin() === FALSE && is_read() === FALSE) { $sql .= " LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`"; - $where .= " AND (`devices`.`device_id`=`DP`.`device_id` AND `DP`.`user_id`=?)"; + $where .= " AND `DP`.`user_id`=?"; $param[] = $_SESSION['user_id']; }