| @@ -42,13 +42,13 @@ | ||
| 42 | 42 | * @return array<string, array<string, AssignmentInformation[]>> |
| 43 | 43 | */ |
| 44 | 44 | private function loadAssignedObjects(string $objectType, bool $ignoreDates): array |
| 45 | 45 | { |
| 46 | - $query = "SELECT `group_id` AS `groupId`, `group_type` AS `groupType`, `object_id` AS `id`, | |
| 47 | - `object_type` AS `objectType`, `from_date` AS `fromDate`, `to_date` AS `toDate` | |
| 48 | - FROM `{$this->database->getUserGroupToObjectTable()}` | |
| 49 | - WHERE `object_id` != '' | |
| 50 | - AND (`general_object_type` = '%s' OR `object_type` = '%s')"; | |
| 46 | + $query = "SELECT group_id AS groupId, group_type AS groupType, object_id AS id, | |
| 47 | + object_type AS objectType, from_date AS fromDate, to_date AS toDate | |
| 48 | + FROM {$this->database->getUserGroupToObjectTable()} | |
| 49 | + WHERE object_id != '' | |
| 50 | + AND (general_object_type = '%s' OR object_type = '%s')"; | |
| 51 | 51 | |
| 52 | 52 | $parameters = [ |
| 53 | 53 | $objectType, |
| 54 | 54 | $objectType |
| @@ -54,9 +54,9 @@ | ||
| 54 | 54 | $objectType |
| 55 | 55 | ]; |
| 56 | 56 | |
| 57 | 57 | if ($ignoreDates === false) { |
| 58 | - $query .= " AND (`from_date` IS NULL OR `from_date` <= '%s') AND (`to_date` IS NULL OR `to_date` >= '%s')"; | |
| 58 | + $query .= " AND (from_date IS NULL OR from_date <= '%s') AND (to_date IS NULL OR to_date >= '%s')"; | |
| 59 | 59 | $time = $this->wordpress->currentTime('mysql'); |
| 60 | 60 | $parameters = array_merge($parameters, [$time, $time]); |
| 61 | 61 | } |
| 62 | 62 | |
