Merge pull request #11082 from colemanw/CRM-20779

CRM-20779 - Fix image display in custom field tab
civicrm · Oct 9, 2017 · 99a5f16 · 99a5f16
2 parents 163494a + 1470f70
commit 99a5f16
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
@@ -1247,7 +1247,13 @@ private static function formatDisplayValue($value, $field, $entityId = NULL) {
         // In the context of displaying a profile, show file/image
         if ($value) {
           if ($entityId) {
-            $url = self::getFileURL($entityId, $field['id']);
+            if (CRM_Utils_Rule::positiveInteger($value)) {
+              $fileId = $value;
+            }
+            else {
+              $fileId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File', $value, 'id', 'uri');
+            }
+            $url = self::getFileURL($entityId, $field['id'], $fileId);
             if ($url) {
               $display = $url['file_url'];
             }