mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-47729 repository_filesystem: smarter sync of references

Browse Source 
It was noticed that if file content was once imported the following
synchronisations do not discover the changes
This commit is contained in:
Marina Glancy 2015-03-13 11:01:02 +08:00
parent beaceef9ee
commit 1c4f42e1b2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repository/filesystem/lib.php
View File

@ -349,7 +349,7 @@ class repository_filesystem extends repository {
static $issyncing = false;
if ($issyncing) {
// Avoid infinite recursion when calling $file->get_filesize() and get_contenthash().
return;
return false;
}
$filepath = $this->get_rootpath() . ltrim($file->get_reference(), '/');
if ($this->is_in_repository($file->get_reference()) && file_exists($filepath) && is_readable($filepath)) {
@ -366,7 +366,12 @@ class repository_filesystem extends repository {
}
} else {
// Update only file size so file will NOT be copied into moodle filepool.
$contenthash = null;
$emptyfile = $contenthash = sha1('');
$currentcontenthash = $file->get_contenthash();
if ($currentcontenthash !== $emptyfile && $currentcontenthash === sha1_file($filepath)) {
// File content was synchronised and has not changed since then, leave it.
$contenthash = null;
}
$filesize = filesize($filepath);
}
$issyncing = false;