From 2b4aea3189f0906e078da36c0fd3349126ced997 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Tue, 17 May 2022 16:40:54 +0000
Subject: [PATCH] drop check for start_time, we check semester_courses anyway,
fixes #1070
Closes #1070
Merge request studip/studip!633
---
lib/classes/globalsearch/GlobalSearchCourses.php | 3 +--
lib/classes/globalsearch/GlobalSearchMyCourses.php | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/classes/globalsearch/GlobalSearchCourses.php b/lib/classes/globalsearch/GlobalSearchCourses.php
index df9de0fa98e..5ba8e44b610 100644
--- a/lib/classes/globalsearch/GlobalSearchCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchCourses.php
@@ -73,8 +73,7 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull
$semester_join = "LEFT JOIN semester_courses ON (courses.Seminar_id = semester_courses.course_id) ";
$semester_condition = "
AND (
- `courses`.start_time <= " . DBManager::get()->quote($semester->beginn) ."
- AND (`semester_courses`.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . "))
+ semester_courses.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . ")
) ";
}
if ($filter['institute']) {
diff --git a/lib/classes/globalsearch/GlobalSearchMyCourses.php b/lib/classes/globalsearch/GlobalSearchMyCourses.php
index 6a5bb0fc2a4..5a0ac188284 100644
--- a/lib/classes/globalsearch/GlobalSearchMyCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchMyCourses.php
@@ -59,8 +59,7 @@ class GlobalSearchMyCourses extends GlobalSearchModule
$semester_join = "LEFT JOIN semester_courses ON (courses.Seminar_id = semester_courses.course_id) ";
$semester_condition = "
AND (
- `courses`.start_time <= " . DBManager::get()->quote($semester->beginn) ."
- AND (`semester_courses`.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . "))
+ semester_courses.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . ")
) ";
}
if ($filter['institute']) {
--
GitLab