Merge pull request #993 from laf/devices-list

Fixed query which caused issues when no devices_perms existed
This commit is contained in:
Daniel Preussker
2015-05-13 17:58:24 +00:00
+3 -2
View File
@@ -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 `DP`.`user_id`=?";
$param[] = $_SESSION['user_id'];
}