re #208

Merge request studip/studip!603

3 files changed, 5 insertions, 10 deletions

diff --git a/lib/classes/SemBrowse.class.php b/lib/classes/SemBrowse.class.php
index 82b683f..fd4b2dc 100644
--- a/lib/classes/SemBrowse.class.php
+++ b/lib/classes/SemBrowse.class.php
@@ -1313,9 +1313,7 @@ class SemBrowse {
     {
         $default_sem = $_SESSION['_default_sem'];
         if (!$default_sem) {
-            $semester_time_switch = (int) Config::get()->getValue('SEMESTER_TIME_SWITCH');
-            $current_sem = Semester::findByTimestamp(time()
-                + $semester_time_switch * 7 * 24 * 60 * 60);
+            $current_sem = Semester::findDefault();
             $default_sem = $current_sem->id;
         }
 
diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index 0f0a3a9..14793ea 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -84,15 +84,13 @@ class BasicDataWizardStep implements CourseWizardStep
                         !$values['start_time'] && Request::isXhr()) {
                         $values['start_time'] = $s->beginn;
                     }
-                } else {
-                    if ((time() >= $s->beginn - Config::get()->SEMESTER_TIME_SWITCH * 86400 * 7)
-                        && (time() < $s->ende - Config::get()->SEMESTER_TIME_SWITCH * 86400 * 7)) {
-                        $values['start_time'] = $s->beginn;
-                    }
                 }
                 $semesters[] = $s;
             }
         }
+        if (!$values['start_time']) {
+            $values['start_time'] = Semester::findDefault()->beginn;
+        }
         if ($values['studygroup'] && (!count($typestruct) || !$values['institute']) ) {
             $message = sprintf(_('Die Konfiguration der Studiengruppen ist unvollständig. ' .
                 'Bitte wenden Sie sich an [die Stud.IP-Administration]%s .'),
diff --git a/lib/classes/globalsearch/GlobalSearchModule.php b/lib/classes/globalsearch/GlobalSearchModule.php
index 7f06faf..084e327 100644
--- a/lib/classes/globalsearch/GlobalSearchModule.php
+++ b/lib/classes/globalsearch/GlobalSearchModule.php
@@ -214,8 +214,7 @@ abstract class GlobalSearchModule
      */
     public static function getCurrentSemester()
     {
-        $sem_time_switch = Config::get()->SEMESTER_TIME_SWITCH;
-        $current_semester = Semester::findByTimestamp(time() + $sem_time_switch * 7 * 24 * 3600);
+        $current_semester = Semester::findDefault();
 
         return (int)$current_semester['beginn'];
     }