Skip to content
Snippets Groups Projects
Commit 021da9cd authored by Tim Otten's avatar Tim Otten
Browse files

Merge pull request #2753 from fuzionnz/CRM-14394

Issue CRM-14394. Check that $path is not NULL, and that the file exists.
parents 5919510c a52de115
No related branches found
No related tags found
No related merge requests found
......@@ -774,10 +774,12 @@ ORDER BY civicrm_custom_group.weight,
list($path) = CRM_Core_BAO_File::path($fileDAO->id, $entityId,
NULL, NULL
);
list($imageWidth, $imageHeight) = getimagesize($path);
list($imageThumbWidth, $imageThumbHeight) = CRM_Contact_BAO_Contact::getThumbSize($imageWidth, $imageHeight);
$customValue['imageThumbWidth'] = $imageThumbWidth;
$customValue['imageThumbHeight'] = $imageThumbHeight;
if ($path && file_exists($path)) {
list($imageWidth, $imageHeight) = getimagesize($path);
list($imageThumbWidth, $imageThumbHeight) = CRM_Contact_BAO_Contact::getThumbSize($imageWidth, $imageHeight);
$customValue['imageThumbWidth'] = $imageThumbWidth;
$customValue['imageThumbHeight'] = $imageThumbHeight;
}
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment