Merge branch 'MDL-55188-master' of git://github.com/abgreeve/moodle

moodle · Jul 30, 2018 · 627d9aa · 627d9aa
2 parents e32fe43 + b41e1d7
commit 627d9aa
Show file tree

Hide file tree

Showing 22 changed files with 178 additions and 996 deletions.
diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php
@@ -35,7 +35,6 @@
 // @codingStandardsIgnoreLine This script does not require login.
 require("../../config.php");
 require_once("lib.php");
-require_once($CFG->libdir.'/eventslib.php');
 require_once($CFG->libdir.'/enrollib.php');
 require_once($CFG->libdir . '/filelib.php');
 

diff --git a/error/index.php b/error/index.php
@@ -1,7 +1,6 @@
 <?php
 
     require('../config.php');
-    require_once($CFG->libdir.'/eventslib.php');
 
     // Form submitted, do not check referer (original page unknown).
     if ($form = data_submitted()) {

diff --git a/lib/adminlib.php b/lib/adminlib.php
@@ -234,9 +234,6 @@ function uninstall_plugin($type, $name) {
     // delete the capabilities that were defined by this module
     capabilities_cleanup($component);
 
-    // remove event handlers and dequeue pending events
-    events_uninstall($component);
-
     // Delete all remaining files in the filepool owned by the component.
     $fs = get_file_storage();
     $fs->delete_component_files($component);

diff --git a/lib/classes/event/base.php b/lib/classes/event/base.php
@@ -834,10 +834,6 @@ public final function trigger() {
         \core\event\manager::dispatch($this);
 
         $this->dispatched = true;
-
-        if ($legacyeventname = static::get_legacy_eventname()) {
-            events_trigger_legacy($legacyeventname, $this->get_legacy_eventdata());
-        }
     }
 
     /**

diff --git a/lib/classes/task/events_cron_task.php b/lib/classes/task/events_cron_task.php
diff --git a/lib/db/tasks.php b/lib/db/tasks.php
@@ -149,15 +149,6 @@
         'dayofweek' => '*',
         'month' => '*'
     ),
-    array(
-        'classname' => 'core\task\events_cron_task',
-        'blocking' => 0,
-        'minute' => '*',
-        'hour' => '*',
-        'day' => '*',
-        'dayofweek' => '*',
-        'month' => '*'
-    ),
     array(
         'classname' => 'core\task\completion_regular_task',
         'blocking' => 0,