MDL-69900 core_backup: Allow IMSCC v1.0 restore to finish

hyokwang-ahn · Oct 9, 2020 · 0544ab9 · 0544ab9
1 parent 5ecd01f
commit 0544ab9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backup/cc/cc2moodle.php b/backup/cc/cc2moodle.php
@@ -794,7 +794,7 @@ public static function log_action ($text, $critical_error = false) {
         }
     }
 
-    protected function critical_error ($text) {
+    protected static function critical_error ($text) {
 
         $path_to_log = static::log_file();
 

diff --git a/backup/cc/entities.class.php b/backup/cc/entities.class.php
@@ -76,7 +76,7 @@ public function load_xml_resource($path_to_file) {
         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;
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        protected function critical_error ($text) {
+        protected static function critical_error ($text) {
             $path_to_log = static::log_file();
@@ Expand Down @@