Skip to content
Snippets Groups Projects
Commit 92fda461 authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

use the same code in getDeletedSingleDates() and getSingleDates(), fixes #3515

Closes #3515

Merge request studip/studip!2401
parent d86d7e8e
No related branches found
No related tags found
No related merge requests found
...@@ -220,7 +220,6 @@ class SeminarDB ...@@ -220,7 +220,6 @@ class SeminarDB
public static function getDeletedSingleDates($seminar_id, $start = 0, $end = 0) public static function getDeletedSingleDates($seminar_id, $start = 0, $end = 0)
{ {
$ret = [];
if (($start != 0) || ($end != 0)) { if (($start != 0) || ($end != 0)) {
$query = "SELECT ex_termine.*, GROUP_CONCAT(trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups $query = "SELECT ex_termine.*, GROUP_CONCAT(trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
FROM ex_termine FROM ex_termine
...@@ -246,12 +245,18 @@ class SeminarDB ...@@ -246,12 +245,18 @@ class SeminarDB
$statement = DBManager::get()->prepare($query); $statement = DBManager::get()->prepare($query);
$statement->execute($parameters); $statement->execute($parameters);
while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $ret = [];
$zw = $row; while ($data = $statement->fetch(PDO::FETCH_ASSOC)) {
$zw['ex_termin'] = TRUE; $data['ex_termin'] = true;
$zw['related_persons'] = explode(',', $zw['related_persons']);
$zw['related_groups'] = explode(',', $zw['related_groups']); if ($data['related_persons']) {
$ret[] = $zw; $data['related_persons'] = explode(',', $data['related_persons']);
}
if ($data['related_groups']) {
$data['related_groups'] = explode(',', $data['related_groups']);
}
$ret[] = $data;
} }
return $ret; return $ret;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment