Merge branch 'MDL-61253-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE

2018-02-01 10:33:56 +08:00
parent 82f5d60aa6 04881b93f1
commit e44cedd104
1 changed files with 12 additions and 0 deletions
@@ -537,6 +537,18 @@ class stored_file {
     * @return bool success
     */
    public function archive_file(file_archive $filearch, $archivepath) {
+        if ($this->repository) {
+            $this->sync_external_file();
+            if ($this->compare_to_string('')) {
+                // This file is not stored locally - attempt to retrieve it from the repository.
+                // This may happen if the repository deliberately does not fetch files, or if there is a failure with the sync.
+                $fileinfo = $this->repository->get_file($this->get_reference());
+                if (isset($fileinfo['path'])) {
+                    return $filearch->add_file_from_pathname($archivepath, $fileinfo['path']);
+                }
+            }
+        }
+
        return $this->filesystem->add_storedfile_to_archive($this, $filearch, $archivepath);
    }