projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15729 from civicrm/5.19
[civicrm-core.git]
/
CRM
/
Utils
/
DeprecatedUtils.php
diff --git
a/CRM/Utils/DeprecatedUtils.php
b/CRM/Utils/DeprecatedUtils.php
index 3ed6d8f86235bb08c643aa066dedccf50c6022cb..ed07a6b2aa61e717ac5062ac9045f5db1e34366f 100644
(file)
--- a/
CRM/Utils/DeprecatedUtils.php
+++ b/
CRM/Utils/DeprecatedUtils.php
@@
-879,10
+879,15
@@
function _civicrm_api3_deprecated_activity_buildmailparams($result, $activityTyp
$params['activity_date_time'] = $result['date'];
$params['details'] = $result['body'];
$params['activity_date_time'] = $result['date'];
$params['details'] = $result['body'];
- for ($i = 1; $i <= 5; $i++) {
+ $numAttachments = Civi::settings()->get('max_attachments_backend') ?? CRM_Core_BAO_File::DEFAULT_MAX_ATTACHMENTS_BACKEND;
+ for ($i = 1; $i <= $numAttachments; $i++) {
if (isset($result["attachFile_$i"])) {
$params["attachFile_$i"] = $result["attachFile_$i"];
}
if (isset($result["attachFile_$i"])) {
$params["attachFile_$i"] = $result["attachFile_$i"];
}
+ else {
+ // No point looping 100 times if there's only one attachment
+ break;
+ }
}
return $params;
}
return $params;