Skip to content
Snippets Groups Projects
Commit 174f11c5 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #3207 

Closes #3207

Merge request studip/studip!2174
parent 81e32c0b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 32 additions and 20 deletions
lib/classes/SemType.class.php
+ 1
− 1
View file @ 174f11c5
......@@ -108,7 +108,7 @@ class SemType implements ArrayAccess
}
public function getClass() {
return $GLOBALS['SEM_CLASS'][$this->data['class']] ?: SemClass::getDefaultSemClass();
return $GLOBALS['SEM_CLASS'][$this->data['class']] ?? SemClass::getDefaultSemClass();
}
/***************************************************************************
......
lib/classes/Seminar.class.php
+ 2
− 2
View file @ 174f11c5
......@@ -307,9 +307,9 @@ class Seminar
$cache_key = 'course/undecorated_data/'. $this->id;
if ($filter) {
$sub_key = $_SESSION['_language'] .'/'. $this->filterStart .'-'. $this->filterEnd;
$sub_key = ($_SESSION['_language'] ?? 'none') .'/'. $this->filterStart .'-'. $this->filterEnd;
} else {
$sub_key = $_SESSION['_language'] .'/unfiltered';
$sub_key = ($_SESSION['_language'] ?? 'none') .'/unfiltered';
}
$data = unserialize($cache->read($cache_key));
......
lib/language.inc.php
+ 1
− 1
View file @ 174f11c5
......@@ -194,7 +194,7 @@ function setTempLanguage ($uid = FALSE, $temp_language = "") {
*/
function restoreLanguage() {
global $_language_domain;
setLocaleEnv($_SESSION['_language'] ?: Config::get()->DEFAULT_LANGUAGE, $_language_domain);
setLocaleEnv($_SESSION['_language'] ?? Config::get()->DEFAULT_LANGUAGE, $_language_domain);
}
/**
......
lib/models/Course.class.php
+ 1
− 1
View file @ 174f11c5
......@@ -880,7 +880,7 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe
$this->setEndSemester($this->duration_time == -1 ? null : Semester::findByTimestamp($this->start_time + $this->duration_time));
}
if ($this->isOpenEnded()) {
$this->start_time = $this->start_time ?: Semester::findCurrent()->beginn;
$this->start_time = $this->start_time ?: Semester::findCurrent()->beginn ?? time();
$this->duration_time = -1;
} else {
$this->start_time = $this->getStartSemester()->beginn;
......
locale/de/LC_MAILS/new_resource_request.php
+ 2
− 2
View file @ 174f11c5
......@@ -2,9 +2,9 @@
in der Raumverwaltung erstellt.
<? if ($requested_room): ?>
<? if (!empty($requested_room)): ?>
Angefragter Raum: <?= $requested_room ?>
<? elseif ($requested_resource): ?>
<? elseif (!empty($requested_resource)): ?>
Angefragte Ressource: <?= $requested_resource ?>
<? endif ?>
......
tests/_support/_generated/FunctionalTesterActions.php
+ 1
− 1
View file @ 174f11c5
<?php //[STAMP] 9862bb9e5ebf65fc43909feeee411c2a
<?php //[STAMP] 80b4e0bf1e286a6a3bd71a25c2b1a786
namespace _generated;
// This class was automatically generated by build task
......
tests/functional/_bootstrap.php
+ 15
− 3
View file @ 174f11c5
<?php
global $STUDIP_BASE_PATH, $ABSOLUTE_URI_STUDIP, $CACHING_ENABLE, $CACHING_FILECACHE_PATH, $SYMBOL_SHORT, $TMP_PATH, $UPLOAD_PATH, $ASSETS_URL;
// common set-up, usually done by lib/bootstraph.php and
// config/config_local.inc.php when run on web server
if (!isset($STUDIP_BASE_PATH)) {
$STUDIP_BASE_PATH = dirname(__DIR__, 2);
$ABSOLUTE_PATH_STUDIP = $STUDIP_BASE_PATH.'/public/';
$UPLOAD_PATH = $STUDIP_BASE_PATH.'/data/upload_doc';
$TMP_PATH = $TMP_PATH ?: '/tmp';
$ASSETS_URL = '';
}
// set include path
$inc_path = ini_get('include_path');
$inc_path .= PATH_SEPARATOR . dirname(__FILE__) . '/../..';
$inc_path .= PATH_SEPARATOR . dirname(__FILE__) . '/../../config';
$inc_path .= PATH_SEPARATOR . __DIR__ . '/../..';
$inc_path .= PATH_SEPARATOR . __DIR__ . '/../../config';
ini_set('include_path', $inc_path);
require 'lib/classes/StudipAutoloader.php';
......@@ -37,7 +49,7 @@ $added_configs = [];
StudipFileloader::load(
'config_defaults.inc.php config_local.inc.php',
$added_configs,
compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'ASSETS_URL', 'CANONICAL_RELATIVE_PATH_STUDIP'),
compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'ASSETS_URL'),
true
);
foreach($added_configs as $key => $value) {
......
tests/functional/lib/models/resources/BuildingTest.php
+ 1
− 1
View file @ 174f11c5
......@@ -49,7 +49,7 @@ class BuildingTest extends \Codeception\Test\Unit
\DBManager::getInstance()->setConnection('studip', $this->db_handle);
// Workaround old-style Stud.IP-API using $GLOBALS['user']
$this->oldUser = $GLOBALS['user'];
$this->oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['user'] = new \Seminar_User(
\User::findByUsername('root@studip')
);
......
tests/functional/lib/models/resources/LocationTest.php
+ 1
− 1
View file @ 174f11c5
......@@ -50,7 +50,7 @@ class LocationTest extends \Codeception\Test\Unit
\DBManager::getInstance()->setConnection('studip', $this->db_handle);
// Workaround old-style Stud.IP-API using $GLOBALS['user']
$this->oldUser = $GLOBALS['user'];
$this->oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['user'] = new \Seminar_User(
\User::findByUsername('root@studip')
);
......
tests/functional/lib/models/resources/ResourceAssignmentTest.php
+ 2
− 2
View file @ 174f11c5
......@@ -52,11 +52,11 @@ class ResourceAssignmentTest extends \Codeception\Test\Unit
\Config::get()->setValue('LOG_ENABLE', false);
// Workaround old-style Stud.IP-API using $GLOBALS['user']
$this->oldUser = $GLOBALS['user'];
$this->oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['user'] = new \Seminar_User(
\User::findByUsername('root@studip')
);
$this->oldPerm = $GLOBALS['perm'];
$this->oldPerm = $GLOBALS['perm'] ?? null;
$GLOBALS['perm'] = new \Seminar_Perm();
//As a final step we create the SORM objects for our test cases:
......
tests/functional/lib/models/resources/ResourceTest.php
+ 2
− 2
View file @ 174f11c5
......@@ -46,11 +46,11 @@ class ResourceTest extends \Codeception\Test\Unit
\DBManager::getInstance()->setConnection('studip', $this->db_handle);
// Workaround old-style Stud.IP-API using $GLOBALS['user']
$this->oldUser = $GLOBALS['user'];
$this->oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['user'] = new \Seminar_User(
\User::findByUsername('root@studip')
);
$this->oldPerm = $GLOBALS['perm'];
$this->oldPerm = $GLOBALS['perm'] ?? null;
$GLOBALS['perm'] = new \Seminar_Perm();
//As a final step we create the SORM objects for our test cases:
......
tests/functional/lib/models/resources/RoomTest.php
+ 2
− 2
View file @ 174f11c5
......@@ -61,11 +61,11 @@ class RoomTest extends \Codeception\Test\Unit
\DBManager::getInstance()->setConnection('studip', $this->db_handle);
// Workaround old-style Stud.IP-API using $GLOBALS['user']
$this->oldUser = $GLOBALS['user'];
$this->oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['user'] = new \Seminar_User(
\User::findByUsername('root@studip')
);
$this->oldPerm = $GLOBALS['perm'];
$this->oldPerm = $GLOBALS['perm'] ?? null;
$GLOBALS['perm'] = new \Seminar_Perm();
//As a final step we create the SORM objects for our test cases:
......
tests/functional/lib/resources/ResourceManagerTest.php
+ 1
− 1
View file @ 174f11c5
......@@ -31,7 +31,7 @@ class ResourceManagerTest extends \Codeception\Test\Unit
\DBManager::getInstance()->setConnection('studip', $this->db_handle);
// Workaround old-style Stud.IP-API using $GLOBALS['user']
$this->oldUser = $GLOBALS['user'];
$this->oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['user'] = new \Seminar_User(
\User::findByUsername('root@studip')
);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment