MDL-15405: missing check

diff --git a/lib/filelib.php b/lib/filelib.php
index bc493236797054ff5aff25f330b276649a4fac6d..b0b96df8ed42e7f68ea359ee79eae1a502644905 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -150,7 +150,7 @@ function file_rewrite_urls($text, $contextid, $filepath, $filearea, $itemid, $cu
         // if a new upload has the same file path/name as an existing file, but different content, we put it in a distinct path.
         $existingfile = $fs->get_file($currentcontextid, $currentfilearea, $currentitemid, $currentfilepath, $currentfilename);
         $uploadedfile = $fs->get_file($contextid, $filearea, $itemid, $filepath, $currentfilename);
-        if ($existingfile->get_contenthash() != $uploadedfile->get_contenthash()) {
+        if ($existingfile && $uploadedfile && ($existingfile->get_contenthash() != $uploadedfile->get_contenthash())) {
             $filepath .= $currentitemid .'/';
         }