Skip to content
Snippets Groups Projects
Commit b4e262b8 authored by eileen's avatar eileen Committed by totten
Browse files

Remove unused file parameters

parent 00a1b09f
No related branches found
No related tags found
No related merge requests found
......@@ -1494,7 +1494,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
'entity_id',
'file_id'
);
list($path) = CRM_Core_BAO_File::path($fileID, $entityId, NULL, NULL);
list($path) = CRM_Core_BAO_File::path($fileID, $entityId);
$url = CRM_Utils_System::url('civicrm/file',
"reset=1&id=$fileID&eid=$contactID",
$absolute, NULL, TRUE, TRUE
......
......@@ -919,7 +919,7 @@ ORDER BY civicrm_custom_group.weight,
);
$customValue['imageURL'] = str_replace('persist/contribute', 'custom', $config->imageUploadURL) .
$fileDAO->uri;
list($path) = CRM_Core_BAO_File::path($fileDAO->id, $entityId, NULL, NULL);
list($path) = CRM_Core_BAO_File::path($fileDAO->id, $entityId);
if ($path && file_exists($path)) {
list($imageWidth, $imageHeight) = getimagesize($path);
list($imageThumbWidth, $imageThumbHeight) = CRM_Contact_BAO_Contact::getThumbSize($imageWidth, $imageHeight);
......
......@@ -71,15 +71,11 @@ class CRM_Core_BAO_File extends CRM_Core_DAO_File {
/**
* @param int $fileID
* @param int $entityID
* @param null $entityTable
*
* @return array
*/
public static function path($fileID, $entityID, $entityTable = NULL) {
public static function path($fileID, $entityID) {
$entityFileDAO = new CRM_Core_DAO_EntityFile();
if ($entityTable) {
$entityFileDAO->entity_table = $entityTable;
}
$entityFileDAO->entity_id = $entityID;
$entityFileDAO->file_id = $fileID;
......
......@@ -50,9 +50,8 @@ class CRM_Core_Page_File extends CRM_Core_Page {
$eid = CRM_Utils_Request::retrieve('eid', 'Positive', $this, TRUE);
$fid = CRM_Utils_Request::retrieve('fid', 'Positive', $this, FALSE);
$id = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
$quest = CRM_Utils_Request::retrieve('quest', 'String', $this);
list($path, $mimeType) = CRM_Core_BAO_File::path($id, $eid, NULL, $quest);
list($path, $mimeType) = CRM_Core_BAO_File::path($id, $eid);
}
if (!$path) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment