mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-55494-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-08-15 13:15:15 +01:00
commit 8d37a33b16
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/tool/monitor/classes/eventlist.php
View File

@ -103,15 +103,16 @@ class eventlist {
foreach ($pluginlist as $plugin => $directory) { foreach ($pluginlist as $plugin => $directory) {
$plugindirectory = $directory . '/classes/event'; $plugindirectory = $directory . '/classes/event';
foreach (self::get_file_list($plugindirectory) as $eventname => $notused) { foreach (self::get_file_list($plugindirectory) as $eventname => $notused) {
$plugineventname = '\\' . $plugintype . '_' . $plugin . '\\event\\' . $eventname; $fullpluginname = $plugintype . '_' . $plugin;
$plugineventname = '\\' . $fullpluginname . '\\event\\' . $eventname;
// Check that this is actually an event. // Check that this is actually an event.
if (method_exists($plugineventname, 'get_static_info') && $plugin != 'monitor') { // No selfie here. if (method_exists($plugineventname, 'get_static_info') && $fullpluginname !== 'tool_monitor') { // No selfie here.
$ref = new \ReflectionClass($plugineventname); $ref = new \ReflectionClass($plugineventname);
if (!$ref->isAbstract() && $plugin != 'legacy') { if (!$ref->isAbstract() && $fullpluginname !== 'logstore_legacy') {
if ($withoutcomponent) { if ($withoutcomponent) {
$noncorepluginlist[$plugineventname] = $plugineventname::get_name_with_info(); $noncorepluginlist[$plugineventname] = $plugineventname::get_name_with_info();
} else { } else {
$noncorepluginlist[$plugintype . '_' . $plugin][$plugineventname] = $plugineventname::get_name_with_info(); $noncorepluginlist[$fullpluginname][$plugineventname] = $plugineventname::get_name_with_info();
} }
} }
} }

2
report/eventlist/classes/list_generator.php
View File

@ -197,7 +197,7 @@ class report_eventlist_list_generator {
if (method_exists($plugineventname, 'get_static_info')) { if (method_exists($plugineventname, 'get_static_info')) {
if ($detail) { if ($detail) {
$ref = new \ReflectionClass($plugineventname); $ref = new \ReflectionClass($plugineventname);
if (!$ref->isAbstract() && $plugin != 'legacy') { if (!$ref->isAbstract() && $plugintype . '_' . $plugin !== 'logstore_legacy') {
$noncorepluginlist = self::format_data($noncorepluginlist, $plugineventname); $noncorepluginlist = self::format_data($noncorepluginlist, $plugineventname);
} }
} else { } else {