aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Noack <noack@data-quest.de>2023-05-02 13:08:52 +0000
committerElmar Ludwig <elmar.ludwig@uni-osnabrueck.de>2023-05-02 13:08:52 +0000
commit4ca7069678a88da56ce75038c1599d96409f2d9b (patch)
treec9752bf838554934b33260ee35f845277f442b95
parent6e15a2bc5a99f579cd12f7069051c2ad87a5e402 (diff)
Resolve #2591 "Studiengruppe: "klassische" Teilnehmerseite ist aktivierbar (über "Mehr")"
Closes #2591 Merge request studip/studip!1749
-rw-r--r--lib/classes/SemClass.class.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php
index cfd7bc0..0fee253 100644
--- a/lib/classes/SemClass.class.php
+++ b/lib/classes/SemClass.class.php
@@ -293,8 +293,8 @@ class SemClass implements ArrayAccess
*/
public function isModuleActivated($modulename)
{
- return empty($this->data['modules'][$modulename])
- || $this->data['modules'][$modulename]['activated'];
+ return isset($this->data['modules'][$modulename])
+ && $this->data['modules'][$modulename]['activated'];
}
/**
@@ -304,9 +304,10 @@ class SemClass implements ArrayAccess
*/
public function isModuleAllowed($modulename)
{
- return empty($this->data['modules'][$modulename])
+ return !$this->isModuleForbidden($modulename)
+ && (empty($this->data['modules'][$modulename])
|| !$this->data['modules'][$modulename]['sticky']
- || $this->data['modules'][$modulename]['activated'];
+ || $this->data['modules'][$modulename]['activated']);
}
/**