Merge branch 'hotfix/1.2.4' into develop

terminal42 · Jul 7, 2015 · 852733f · 852733f
2 parents 7ce1b5a + c2cecc8
commit 852733f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/library/NotificationCenter/MessageDraft/EmailMessageDraft.php b/library/NotificationCenter/MessageDraft/EmailMessageDraft.php
@@ -183,6 +183,11 @@ public function getAttachments()
 
         if (!empty($arrStaticAttachments)) {
             $objFiles = \FilesModel::findMultipleByUuids($arrStaticAttachments);
+
+            if ($objFiles === null) {
+                return $arrAttachments;
+            }
+
             while ($objFiles->next()) {
                 $arrAttachments[] = TL_ROOT . '/' . $objFiles->path;
             }