Merge pull request civicrm#15055 from demeritcowboy/file-no-description

dev/core#1186 - ignore exception if no description field
seamuslee001 · Aug 17, 2019 · e251108 · e251108
2 parents 40a5085 + 419b013
commit e251108
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
@@ -1172,7 +1172,16 @@ private static function formatDisplayValue($value, $field, $entityId = NULL) {
             // In other contexts show a paperclip icon
             if (CRM_Utils_Rule::integer($value)) {
               $icons = CRM_Core_BAO_File::paperIconAttachment('*', $value);
-              $display = $icons[$value] . civicrm_api3('File', 'getvalue', ['return' => "description", 'id' => $value]);
+
+              $file_description = '';
+              try {
+                $file_description = civicrm_api3('File', 'getvalue', ['return' => "description", 'id' => $value]);
+              }
+              catch (CiviCRM_API3_Exception $dontcare) {
+                // don't care
+              }
+
+              $display = "{$icons[$value]}{$file_description}";
             }
             else {
               //CRM-18396, if filename is passed instead