Skip to content
Snippets Groups Projects
Commit 4ca70696 authored by André Noack's avatar André Noack Committed by Elmar Ludwig
Browse files

Resolve #2591 "Studiengruppe: "klassische" Teilnehmerseite ist aktivierbar (über "Mehr")" 

Closes #2591

Merge request studip/studip!1749
parent 6e15a2bc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/classes/SemClass.class.php
+ 5
− 4
View file @ 4ca70696
...@@ -293,8 +293,8 @@ class SemClass implements ArrayAccess ...@@ -293,8 +293,8 @@ class SemClass implements ArrayAccess
*/ */
public function isModuleActivated($modulename) public function isModuleActivated($modulename)
{ {
return empty($this->data['modules'][$modulename]) return isset($this->data['modules'][$modulename])
|| $this->data['modules'][$modulename]['activated']; && $this->data['modules'][$modulename]['activated'];
} }
/** /**
...@@ -304,9 +304,10 @@ class SemClass implements ArrayAccess ...@@ -304,9 +304,10 @@ class SemClass implements ArrayAccess
*/ */
public function isModuleAllowed($modulename) 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]['sticky']
|| $this->data['modules'][$modulename]['activated']; || $this->data['modules'][$modulename]['activated']);
} }
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment