From 25acfd6bc2c07101c4dc1347fdda64eda545afcb Mon Sep 17 00:00:00 2001 From: Kurund Jalmi Date: Wed, 15 May 2013 13:07:08 -0400 Subject: [PATCH] notice fixes --- CRM/Core/Report/Excel.php | 5 +++-- CRM/Export/BAO/Export.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Core/Report/Excel.php b/CRM/Core/Report/Excel.php index 19e03145ee..953fab834e 100644 --- a/CRM/Core/Report/Excel.php +++ b/CRM/Core/Report/Excel.php @@ -41,8 +41,9 @@ class CRM_Core_Report_Excel { * @return mixed empty if output is printed, else output * * @access public + * @static */ - function makeCSVTable(&$header, &$rows, $titleHeader = NULL, $print = TRUE, $outputHeader = TRUE) { + static function makeCSVTable(&$header, &$rows, $titleHeader = NULL, $print = TRUE, $outputHeader = TRUE) { if ($titleHeader) { echo $titleHeader; } @@ -186,7 +187,7 @@ class CRM_Core_Report_Excel { * @public * @static */ - function writeCSVFile($fileName, &$header, &$rows, $titleHeader = NULL, $outputHeader = TRUE, $saveFile = NULL) { + static function writeCSVFile($fileName, &$header, &$rows, $titleHeader = NULL, $outputHeader = TRUE, $saveFile = NULL) { if ($outputHeader && !$saveFile) { CRM_Utils_System::download(CRM_Utils_String::munge($fileName), 'text/x-csv', diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index d81160b645..58210777b8 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -1093,7 +1093,7 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c * * @return string name of the file */ - function getExportFileName($output = 'csv', $mode = CRM_Export_Form_Select::CONTACT_EXPORT) { + static function getExportFileName($output = 'csv', $mode = CRM_Export_Form_Select::CONTACT_EXPORT) { switch ($mode) { case CRM_Export_Form_Select::CONTACT_EXPORT: return ts('CiviCRM Contact Search'); -- 2.25.1