From 4ca7069678a88da56ce75038c1599d96409f2d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Tue, 2 May 2023 13:08:52 +0000
Subject: [PATCH] =?UTF-8?q?Resolve=20#2591=20"Studiengruppe:=20"klassische?=
=?UTF-8?q?"=20Teilnehmerseite=20ist=20aktivierbar=20(=C3=BCber=20"Mehr")"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #2591
Merge request studip/studip!1749
---
lib/classes/SemClass.class.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php
index cfd7bc03a74..0fee25341cf 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']);
}
/**
--
GitLab