Merge branch 'MDL-69900-master' of git://github.com/mihailges/moodle into master

This commit is contained in:
Sara Arjona 2020-10-19 13:41:51 +02:00
commit 66e3cceaa2
2 changed files with 2 additions and 2 deletions

View File

@ -794,7 +794,7 @@ class cc2moodle {
}
}
protected function critical_error ($text) {
protected static function critical_error ($text) {
$path_to_log = static::log_file();

View File

@ -76,7 +76,7 @@ class entities {
cc2moodle::log_action('Load the XML resource file: '.$path_to_file);
if (!$resource->load($path_to_file)) {
cc2moodle::log_action('Cannot load the XML resource file: ' . $path_to_file, true);
cc2moodle::log_action('Cannot load the XML resource file: ' . $path_to_file, false);
}
return $resource;