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

drop check for start_time, we check semester_courses anyway, fixes #1070

Closes #1070

Merge request studip/studip!633
parent 222976b8
No related branches found
No related tags found
No related merge requests found
...@@ -73,8 +73,7 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull ...@@ -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_join = "LEFT JOIN semester_courses ON (courses.Seminar_id = semester_courses.course_id) ";
$semester_condition = " $semester_condition = "
AND ( AND (
`courses`.start_time <= " . DBManager::get()->quote($semester->beginn) ." semester_courses.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . ")
AND (`semester_courses`.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . "))
) "; ) ";
} }
if ($filter['institute']) { if ($filter['institute']) {
......
...@@ -59,8 +59,7 @@ class GlobalSearchMyCourses extends GlobalSearchModule ...@@ -59,8 +59,7 @@ class GlobalSearchMyCourses extends GlobalSearchModule
$semester_join = "LEFT JOIN semester_courses ON (courses.Seminar_id = semester_courses.course_id) "; $semester_join = "LEFT JOIN semester_courses ON (courses.Seminar_id = semester_courses.course_id) ";
$semester_condition = " $semester_condition = "
AND ( AND (
`courses`.start_time <= " . DBManager::get()->quote($semester->beginn) ." semester_courses.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . ")
AND (`semester_courses`.semester_id IS NULL OR semester_courses.semester_id IN (" . join(',', array_map([DBManager::get(), 'quote'], $semester_ids)) . "))
) "; ) ";
} }
if ($filter['institute']) { if ($filter['institute']) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment