From 92fda4614106ea882672944ecca6d8a112d63948 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Wed, 29 Nov 2023 12:38:02 +0000
Subject: [PATCH] use the same code in getDeletedSingleDates() and
getSingleDates(), fixes #3515
Closes #3515
Merge request studip/studip!2401
---
lib/raumzeit/SeminarDB.class.php | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lib/raumzeit/SeminarDB.class.php b/lib/raumzeit/SeminarDB.class.php
index 566f7af5af5..63241fece80 100644
--- a/lib/raumzeit/SeminarDB.class.php
+++ b/lib/raumzeit/SeminarDB.class.php
@@ -220,7 +220,6 @@ class SeminarDB
public static function getDeletedSingleDates($seminar_id, $start = 0, $end = 0)
{
- $ret = [];
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
FROM ex_termine
@@ -246,12 +245,18 @@ class SeminarDB
$statement = DBManager::get()->prepare($query);
$statement->execute($parameters);
- while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
- $zw = $row;
- $zw['ex_termin'] = TRUE;
- $zw['related_persons'] = explode(',', $zw['related_persons']);
- $zw['related_groups'] = explode(',', $zw['related_groups']);
- $ret[] = $zw;
+ $ret = [];
+ while ($data = $statement->fetch(PDO::FETCH_ASSOC)) {
+ $data['ex_termin'] = true;
+
+ if ($data['related_persons']) {
+ $data['related_persons'] = explode(',', $data['related_persons']);
+ }
+ if ($data['related_groups']) {
+ $data['related_groups'] = explode(',', $data['related_groups']);
+ }
+
+ $ret[] = $data;
}
return $ret;
}
--
GitLab