Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/m…

…oodle
moodle · May 4, 2017 · 641af8d · 641af8d
2 parents 03262b0 + e8d39b3
commit 641af8d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/lib/classes/task/calendar_cron_task.php b/lib/classes/task/calendar_cron_task.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once($CFG->libdir . '/cronlib.php');
+require_once($CFG->dirroot . '/calendar/lib.php');
 
 /**
  * Simple task to run the calendar cron.

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
@@ -6612,6 +6612,7 @@ function calendar_cron() {
 
     global $CFG, $DB;
 
+    require_once($CFG->dirroot . '/calendar/lib.php');
     // In order to execute this we need bennu.
     require_once($CFG->libdir.'/bennu/bennu.inc.php');
 

diff --git a/lib/tests/calendar_cron_task_test.php b/lib/tests/calendar_cron_task_test.php
@@ -24,6 +24,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+global $CFG;
+require_once($CFG->dirroot . '/calendar/lib.php');
+
 /**
  * Class containing unit tests for the calendar cron task.
  *