From def3a1f06a622b1310ab506b96499da4dba62935 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Tue, 19 Feb 2019 12:39:50 +1100 Subject: [PATCH] Fix file e-notice by using the correct url variables --- CRM/Core/BAO/CustomField.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index acd49480b5..f110870e63 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -1497,7 +1497,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { list($path) = CRM_Core_BAO_File::path($fileID, $entityId); $fileHash = CRM_Core_BAO_File::generateFileHash($entityId, $fileID); $url = CRM_Utils_System::url('civicrm/file', - "reset=1&id=$fileID&eid=$contactID&fcs=$fileHash", + "reset=1&id=$fileID&eid=$entityId&fcs=$fileHash", $absolute, NULL, TRUE, TRUE ); $result['file_url'] = CRM_Utils_File::getFileURL($path, $fileType, $url); @@ -1508,7 +1508,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { $fileID, 'uri' ); - $fileHash = CRM_Core_BAO_File::generateFileHash($entityId, $fileID); + $fileHash = CRM_Core_BAO_File::generateFileHash($contactID, $fileID); $url = CRM_Utils_System::url('civicrm/file', "reset=1&id=$fileID&eid=$contactID&fcs=$fileHash", $absolute, NULL, TRUE, TRUE -- 2.25.1