From 4bae0d2bcf9dbaa6bebc2763acc68e04c0a713c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Bl=C3=A4ul?= Date: Fri, 3 Nov 2017 18:41:28 +0100 Subject: [PATCH] Re-added the code to grap object-level filename in output() Follow-up on pull request #88: No breaking compatibality with older parsecsv versions. If no output to browser is desired, set $output_filename to null, or use unparse() function. --- parsecsv.lib.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 1660a69..7da821e 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -448,14 +448,20 @@ 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 downloadable file - * @param [array] $data 2D array with data - * @param [array] $fields Field names - * @param [type] $delimiter delimiter used to separate data + * @param string|null $filename If a filename is specified here or in the + * object, 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 string|null $delimiter character used to separate data * - * @return [string] the resulting CSV 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;