Merge branch 'MDL-65995' of git://github.com/stronk7/moodle

This commit is contained in:
Jake Dallimore 2019-06-27 13:37:50 +08:00
commit c0cc1ebe85

View File

@ -537,9 +537,8 @@ $cache = '.var_export($cache, true).';
if (file_exists("$ownerdir/db/subplugins.json")) {
$subplugins = (array) json_decode(file_get_contents("$ownerdir/db/subplugins.json"))->plugintypes;
} else if (file_exists("$ownerdir/db/subplugins.php")) {
debugging('Use of subplugins.php has been deprecated. ' .
'Please update your plugin to provide a subplugins.json file instead.',
DEBUG_DEVELOPER);
error_log('Use of subplugins.php has been deprecated. ' .
"Please update your '$ownerdir' plugin to provide a subplugins.json file instead.");
include("$ownerdir/db/subplugins.php");
}