Skip to content

Commit e56e8e3

Browse files
committed
MDL-44985 libraries: Final deprecation of conditional classes and apis
1 parent 2d84748 commit e56e8e3

10 files changed

+8
-749
lines changed

course/editsection.php

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
require_once("../config.php");
2727
require_once("lib.php");
2828
require_once($CFG->libdir . '/formslib.php');
29-
require_once($CFG->libdir . '/conditionlib.php');
3029

3130
$id = required_param('id', PARAM_INT); // course_sections.id
3231
$sectionreturn = optional_param('sr', 0, PARAM_INT);

course/lib.php

-3
Original file line numberDiff line numberDiff line change
@@ -998,9 +998,6 @@ function get_array_of_activities($courseid) {
998998
// groupingid - grouping id
999999
// extra - contains extra string to include in any link
10001000
global $CFG, $DB;
1001-
if(!empty($CFG->enableavailability)) {
1002-
require_once($CFG->libdir.'/conditionlib.php');
1003-
}
10041001

10051002
$course = $DB->get_record('course', array('id'=>$courseid));
10061003

course/modedit.php

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
require_once($CFG->libdir.'/filelib.php');
2929
require_once($CFG->libdir.'/gradelib.php');
3030
require_once($CFG->libdir.'/completionlib.php');
31-
require_once($CFG->libdir.'/conditionlib.php');
3231
require_once($CFG->libdir.'/plagiarismlib.php');
3332
require_once($CFG->dirroot . '/course/modlib.php');
3433

course/tests/courselib_test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private function create_specific_module_test($modulename) {
233233
']}';
234234
$coursegradeitem = grade_item::fetch_course_item($moduleinfo->course); //the activity will become available only when the user reach some grade into the course itself.
235235
$moduleinfo->conditiongradegroup = array(array('conditiongradeitemid' => $coursegradeitem->id, 'conditiongrademin' => 10, 'conditiongrademax' => 80));
236-
$moduleinfo->conditionfieldgroup = array(array('conditionfield' => 'email', 'conditionfieldoperator' => OP_CONTAINS, 'conditionfieldvalue' => '@'));
236+
$moduleinfo->conditionfieldgroup = array(array('conditionfield' => 'email', 'conditionfieldoperator' => \availability_profile\condition::OP_CONTAINS, 'conditionfieldvalue' => '@'));
237237
$moduleinfo->conditioncompletiongroup = array(array('conditionsourcecmid' => $assigncm->id, 'conditionrequiredcompletion' => COMPLETION_COMPLETE)); // "conditionsourcecmid == 0" => none
238238

239239
// Grading and Advanced grading.

course/view.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
require_once('../config.php');
66
require_once('lib.php');
7-
require_once($CFG->libdir.'/conditionlib.php');
87
require_once($CFG->libdir.'/completionlib.php');
98

109
$id = optional_param('id', 0, PARAM_INT);

0 commit comments

Comments
 (0)