parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 00:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not force filename if not set explicitly

Browse Source 
Per docblock, the function output() is supposed to output to browser
    only if filename is passed into it.
    If not, it should return the CSV as a string, not auto-set filename.
This commit is contained in:
Jan Piskvor Martinec
2016-10-31 11:22:32 +01:00
committed by Fonata
parent 2ae35c26ff
commit 189746405f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
parsecsv.lib.php
View File

@@ -448,17 +448,14 @@ class parseCSV {
* Generate a CSV based string for output.
*
* @access public
* @param [string] $filename If specified, headers and data will be output directly to browser as a downloable file
* @param [string] $filename If specified, headers and data will be output directly to browser as a downloadable file
* @param [array] $data 2D array with data
* @param [array] $fields Field names
* @param [type] $delimiter delimiter used to separate data
*
* @return [string]
* @return [string] the resulting CSV string
*/
public function output($filename = null, $data = array(), $fields = array(), $delimiter = null) {
if (empty($filename)) {
$filename = $this->output_filename;
}
if ($delimiter === null) {
$delimiter = $this->output_delimiter;