From 54a043e4de10998672f0faa96e6caf1f4e831acb Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 14 Feb 2019 07:09:26 +1100 Subject: [PATCH] Try and use the correct variable for file id in custom field uploads and use the standard checksum timout as well --- CRM/Core/BAO/CustomField.php | 2 +- CRM/Core/BAO/File.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index fefffa4870..5f2c432773 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -1495,7 +1495,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { 'file_id' ); list($path) = CRM_Core_BAO_File::path($fileID, $entityId); - $fileHash = CRM_Core_BAO_File::generateFileHash($eid, $fid); + $fileHash = CRM_Core_BAO_File::generateFileHash($eid, $fileID); $url = CRM_Utils_System::url('civicrm/file', "reset=1&id=$fileID&eid=$contactID&fcs=$fileHash", $absolute, NULL, TRUE, TRUE diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php index 30e26b9a29..a7fcc5fbd9 100644 --- a/CRM/Core/BAO/File.php +++ b/CRM/Core/BAO/File.php @@ -784,7 +784,8 @@ AND CEF.entity_id = %2"; $genTs = time(); } if (!$life) { - $life = 24 * 2; + $days = Civi::settings()->get('checksum_timeout'); + $live = 24 * $days; } // Trim 8 chars off the string, make it slightly easier to find // but reveals less information from the hash. -- 2.25.1