Merge pull request #663 from catalyst/objectfs-mimetype-null-handling-44

Objectfs mimetype null/string handling
catalyst · Jan 24, 2025 · 2348f52 · 2348f52
2 parents 55f2a4b + e2a4d16
commit 2348f52
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/classes/local/store/object_file_system.php b/classes/local/store/object_file_system.php
@@ -178,11 +178,12 @@ protected function get_mimetype_from_hash(string $contenthash): string {
 
         // We limit 1 because multiple files can have the same contenthash.
         // However, they all have the same mimetype so it does not matter which one we query.
-        return $DB->get_field_sql('SELECT mimetype
+        $mimetype = $DB->get_field_sql('SELECT mimetype
                               FROM {files}
                              WHERE contenthash = :hash
                              LIMIT 1',
                         ['hash' => $contenthash]);
+        return !empty($mimetype) ? $mimetype : '';
     }
 
     /**