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

Merge branch 'MDL-38035-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2013-03-19 23:57:51 +01:00
parent e4095955ed 0e79c3ee74
commit 87342f4cfb
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/editsection_form.php
+2 -2
View File
@@ -54,6 +54,7 @@ class editsection_form extends moodleform {
$mform = $this->_form;
$course = $this->_customdata['course'];
$context = context_course::instance($course->id);
if (!empty($CFG->enableavailability)) {
$mform->addElement('header', '', get_string('availabilityconditions', 'condition'));
@@ -65,7 +66,6 @@ class editsection_form extends moodleform {
$options[0] = get_string('none');
if ($groupings = $DB->get_records('groupings', array('courseid' => $course->id))) {
foreach ($groupings as $grouping) {
$context = context_course::instance($course->id);
$options[$grouping->id] = format_string(
$grouping->name, true, array('context' => $context));
}
@@ -122,7 +122,7 @@ class editsection_form extends moodleform {
// Conditions based on user fields
$operators = condition_info::get_condition_user_field_operators();
$useroptions = condition_info::get_condition_user_fields();
$useroptions = condition_info::get_condition_user_fields(array('context' => $context));
asort($useroptions);
$useroptions = array(0 => $strcondnone) + $useroptions;