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

2020-10-19 13:42:13 +02:00
parent 00a46671fa 5cb1cf7695
commit 856c31cc32
2 changed files with 2 additions and 2 deletions
@@ -794,7 +794,7 @@ class cc2moodle {
        }
    }

-    protected function critical_error ($text) {
+    protected static function critical_error ($text) {

        $path_to_log = static::log_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;