L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2014-04-18 10:30:12 +08:00
parent 2e6b251de2 02dd7ac2ea
commit 166dfd56b8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
availability/condition/group/classes/frontend.php
+5 -3
View File
@@ -79,9 +79,11 @@ class frontend extends \core_availability\frontend {
\section_info $section = null) {
global $CFG;
// Group option can be used on sections, and on modules but only
// if groupmembersonly is turned off. (To avoid confusion.)
if (!is_null($cm) && $CFG->enablegroupmembersonly) {
// If groupmembersonly is turned on, then you can only add group
// restrictions on sections (which don't use groupmembersonly) and
// not on modules. This is to avoid confusion - otherwise
// there would be two ways to add restrictions based on groups.
if (is_null($section) && $CFG->enablegroupmembersonly) {
return false;
}
availability/condition/grouping/classes/frontend.php
+5 -3
View File
@@ -74,9 +74,11 @@ class frontend extends \core_availability\frontend {
\section_info $section = null) {
global $CFG, $DB;
// Grouping option can be used on sections, and on modules but only
// if groupmembersonly is turned off. (To avoid confusion.)
if (!is_null($cm) && $CFG->enablegroupmembersonly) {
// If groupmembersonly is turned on, then you can only add group
// restrictions on sections (which don't use groupmembersonly) and
// not on modules. This is to avoid confusion - otherwise
// there would be two ways to add restrictions based on groups.
if (is_null($section) && $CFG->enablegroupmembersonly) {
return false;
}