Skip to content

Commit 627d9aa

Browse files
author
David Monllao
committed
Merge branch 'MDL-55188-master' of git://github.com/abgreeve/moodle
2 parents e32fe43 + b41e1d7 commit 627d9aa

File tree

22 files changed

+178
-996
lines changed

22 files changed

+178
-996
lines changed

enrol/paypal/ipn.php

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
// @codingStandardsIgnoreLine This script does not require login.
3636
require("../../config.php");
3737
require_once("lib.php");
38-
require_once($CFG->libdir.'/eventslib.php');
3938
require_once($CFG->libdir.'/enrollib.php');
4039
require_once($CFG->libdir . '/filelib.php');
4140

error/index.php

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

33
require('../config.php');
4-
require_once($CFG->libdir.'/eventslib.php');
54

65
// Form submitted, do not check referer (original page unknown).
76
if ($form = data_submitted()) {

lib/adminlib.php

-3
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@ function uninstall_plugin($type, $name) {
234234
// delete the capabilities that were defined by this module
235235
capabilities_cleanup($component);
236236

237-
// remove event handlers and dequeue pending events
238-
events_uninstall($component);
239-
240237
// Delete all remaining files in the filepool owned by the component.
241238
$fs = get_file_storage();
242239
$fs->delete_component_files($component);

lib/classes/event/base.php

-4
Original file line numberDiff line numberDiff line change
@@ -834,10 +834,6 @@ public final function trigger() {
834834
\core\event\manager::dispatch($this);
835835

836836
$this->dispatched = true;
837-
838-
if ($legacyeventname = static::get_legacy_eventname()) {
839-
events_trigger_legacy($legacyeventname, $this->get_legacy_eventdata());
840-
}
841837
}
842838

843839
/**

lib/classes/task/events_cron_task.php

-48
This file was deleted.

lib/db/tasks.php

-9
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,6 @@
149149
'dayofweek' => '*',
150150
'month' => '*'
151151
),
152-
array(
153-
'classname' => 'core\task\events_cron_task',
154-
'blocking' => 0,
155-
'minute' => '*',
156-
'hour' => '*',
157-
'day' => '*',
158-
'dayofweek' => '*',
159-
'month' => '*'
160-
),
161152
array(
162153
'classname' => 'core\task\completion_regular_task',
163154
'blocking' => 0,

0 commit comments

Comments
 (0)