projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '5.11' of https://github.com/civicrm/civicrm-core
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
CustomField.php
diff --git
a/CRM/Core/BAO/CustomField.php
b/CRM/Core/BAO/CustomField.php
index 988cbdb67ac54f3a5b2c190527a3f78730374c11..82038c39e4c6634c1f55a4647bff727aaf0c4129 100644
(file)
--- a/
CRM/Core/BAO/CustomField.php
+++ b/
CRM/Core/BAO/CustomField.php
@@
-1494,9
+1494,10
@@
class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
'entity_id',
'file_id'
);
'entity_id',
'file_id'
);
- list($path) = CRM_Core_BAO_File::path($fileID, $entityId, NULL, NULL);
+ list($path) = CRM_Core_BAO_File::path($fileID, $entityId);
+ $fileHash = CRM_Core_BAO_File::generateFileHash($entityId, $fileID);
$url = CRM_Utils_System::url('civicrm/file',
$url = CRM_Utils_System::url('civicrm/file',
- "reset=1&id=$fileID&eid=$
contactID
",
+ "reset=1&id=$fileID&eid=$
entityId&fcs=$fileHash
",
$absolute, NULL, TRUE, TRUE
);
$result['file_url'] = CRM_Utils_File::getFileURL($path, $fileType, $url);
$absolute, NULL, TRUE, TRUE
);
$result['file_url'] = CRM_Utils_File::getFileURL($path, $fileType, $url);
@@
-1507,8
+1508,9
@@
class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
$fileID,
'uri'
);
$fileID,
'uri'
);
+ $fileHash = CRM_Core_BAO_File::generateFileHash($contactID, $fileID);
$url = CRM_Utils_System::url('civicrm/file',
$url = CRM_Utils_System::url('civicrm/file',
- "reset=1&id=$fileID&eid=$contactID",
+ "reset=1&id=$fileID&eid=$contactID
&fcs=$fileHash
",
$absolute, NULL, TRUE, TRUE
);
$result['file_url'] = CRM_Utils_File::getFileURL($uri, $fileType, $url);
$absolute, NULL, TRUE, TRUE
);
$result['file_url'] = CRM_Utils_File::getFileURL($uri, $fileType, $url);