From 63e5be1449cb7db8c5a66ee55e693db20d9a4f17 Mon Sep 17 00:00:00 2001
From: Andrei Mondoc <andreimondoc@gmail.com>
Date: Sat, 13 Oct 2018 16:55:08 +0100
Subject: [PATCH] correct inconsistent fileID reference
Signed-off-by: Kevin Cristiano <kcristiano@tadpole.cc>
---
civicrm/CRM/Core/BAO/CustomField.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/civicrm/CRM/Core/BAO/CustomField.php b/civicrm/CRM/Core/BAO/CustomField.php
index 8dd1a491fc..3c13c724c4 100644
--- a/civicrm/CRM/Core/BAO/CustomField.php
+++ b/civicrm/CRM/Core/BAO/CustomField.php
@@ -1662,7 +1662,7 @@ SELECT id
$value = 0;
}
- $fileId = NULL;
+ $fileID = NULL;
if ($customFields[$customFieldId]['data_type'] == 'File') {
if (empty($value)) {
@@ -1701,20 +1701,20 @@ SELECT $columnName
FROM $tableName
WHERE id = %1";
$params = array(1 => array($customValueId, 'Integer'));
- $fileId = CRM_Core_DAO::singleValueQuery($query, $params);
+ $fileID = CRM_Core_DAO::singleValueQuery($query, $params);
}
$fileDAO = new CRM_Core_DAO_File();
- if ($fileId) {
- $fileDAO->id = $fileId;
+ if ($fileID) {
+ $fileDAO->id = $fileID;
}
$fileDAO->uri = $filename;
$fileDAO->mime_type = $mimeType;
$fileDAO->upload_date = date('YmdHis');
$fileDAO->save();
- $fileId = $fileDAO->id;
+ $fileID = $fileDAO->id;
$value = $filename;
}
@@ -1742,7 +1742,7 @@ SELECT $columnName
'custom_group_id' => $groupID,
'table_name' => $tableName,
'column_name' => $columnName,
- 'file_id' => $fileId,
+ 'file_id' => $fileID,
'is_multiple' => $customFields[$customFieldId]['is_multiple'],
);
--
GitLab