Merge branch 'wip-MDL-44501-master' of git://github.com/abgreeve/moodle

iFixit · Jun 9, 2014 · 61e1166 · 61e1166
2 parents d663c5a + f3998ce
commit 61e1166
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mod/data/locallib.php b/mod/data/locallib.php
@@ -348,7 +348,9 @@ public static function formats($fields, $record) {
         $includedfiles = array();
         foreach ($fields as $singlefield) {
             if (is_callable(array($singlefield, 'get_file'))) {
-                $includedfiles[] = $singlefield->get_file($record->id);
+                if ($file = $singlefield->get_file($record->id)) {
+                    $includedfiles[] = $file;
+                }
             }
         }
         if (count($includedfiles) == 1 && count($fields) == 1) {