Merge pull request #17051 from eileenmcnaughton/ex

Remove outputHeader as a param for writeCSVFile as it is always true
civicrm · Apr 17, 2020 · 0aa61b6 · 0aa61b6
2 parents 1535825 + c93c138
commit 0aa61b6
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/CRM/Core/Report/Excel.php b/CRM/Core/Report/Excel.php
@@ -152,23 +152,20 @@ public function writeHTMLFile($fileName, $header, $rows, $titleHeader = NULL, $o
    *   An array of the headers.
    * @param array $rows
    *   An array of arrays of the table contents.
-   * @param bool $outputHeader
-   *   Should we output the header row.
    *
    * @return void
    */
-  public static function writeCSVFile($fileName, $header, $rows, $outputHeader = TRUE) {
-    if ($outputHeader) {
-      CRM_Utils_System::download(CRM_Utils_String::munge($fileName),
-        'text/x-csv',
-        CRM_Core_DAO::$_nullObject,
-        'csv',
-        FALSE
-      );
-    }
+  public static function writeCSVFile($fileName, $header, $rows) {
+    $null = NULL;
+    CRM_Utils_System::download(CRM_Utils_String::munge($fileName),
+      'text/x-csv',
+      $null,
+      'csv',
+      FALSE
+    );
 
     if (!empty($rows)) {
-      return self::makeCSVTable($header, $rows, $outputHeader);
+      return self::makeCSVTable($header, $rows, TRUE);
     }
   }