X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FFile.php;h=064fa7b263c8f4da40328adc5af04ad70663990e;hb=ff7da3a6508d0a7059c6527216920b2efb896b93;hp=4022915dc1fe6b9b5192cb2017c5b3e2b579f279;hpb=3beb999f86bc826d2b0b4f778aa32b3d1d0bc791;p=civicrm-core.git diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php index 4022915dc1..064fa7b263 100644 --- a/CRM/Core/BAO/File.php +++ b/CRM/Core/BAO/File.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -85,7 +85,7 @@ class CRM_Core_BAO_File extends CRM_Core_DAO_File { * * @throws Exception */ - static function filePostProcess( + public static function filePostProcess( $data, $fileTypeID, $entityTable, @@ -472,7 +472,6 @@ AND CEF.entity_id = %2"; * * @return array * An array with 2 elements. The string and the number of attachments - * @static */ public static function attachmentInfo($entityTable, $entityID, $separator = '
') { if (!$entityID) { @@ -496,7 +495,7 @@ AND CEF.entity_id = %2"; * @param $entityTable * @param int $entityID */ - static function formatAttachment( + public static function formatAttachment( &$formValues, &$params, $entityTable, @@ -630,7 +629,6 @@ AND CEF.entity_id = %2"; /** * Delete a file attachment from an entity table / entity ID * - * @static */ public static function deleteAttachment() { $params = array(); @@ -661,7 +659,6 @@ AND CEF.entity_id = %2"; * @return array|NULL * list of HTML snippets; one HTML snippet for each attachment. If none found, then NULL * - * @static */ public static function paperIconAttachment($entityTable, $entityID) { if (empty($entityTable) || !$entityID) { @@ -672,7 +669,6 @@ AND CEF.entity_id = %2"; foreach ($currentAttachmentInfo as $fileKey => $fileValue) { $fileID = $fileValue['fileID']; $fileType = $fileValue['mime_type']; - $eid = $entityID; if ($fileID) { if ($fileType == 'image/jpeg' || $fileType == 'image/pjpeg' || @@ -720,4 +716,5 @@ AND CEF.entity_id = %2"; } return NULL; } + }