diff --git a/Spreadsheet/Excel/Writer/Workbook.php b/Spreadsheet/Excel/Writer/Workbook.php index a47dc33..ae95fba 100644 --- a/Spreadsheet/Excel/Writer/Workbook.php +++ b/Spreadsheet/Excel/Writer/Workbook.php @@ -337,8 +337,8 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri $this->_activesheet, $this->_firstsheet, $this->_str_total, $this->_str_unique, $this->_str_table, $this->_url_format, - $this->_parser); - + $this->_parser, $this->_tmp_dir); + $this->_worksheets[$index] = &$worksheet; // Store ref for iterator $this->_sheetnames[$index] = $name; // Store EXTERNSHEET names $this->_parser->setExtSheet($name, $index); // Register worksheet name with parser diff --git a/Spreadsheet/Excel/Writer/Worksheet.php b/Spreadsheet/Excel/Writer/Worksheet.php index c7bd8c7..8dfc2c1 100644 --- a/Spreadsheet/Excel/Writer/Worksheet.php +++ b/Spreadsheet/Excel/Writer/Worksheet.php @@ -364,13 +364,15 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr * @param mixed &$firstsheet The first worksheet in the workbook we belong to * @param mixed &$url_format The default format for hyperlinks * @param mixed &$parser The formula parser created for the Workbook + * @param string $tmp_dir The path to the directory for temporary files * @access private */ function Spreadsheet_Excel_Writer_Worksheet($BIFF_version, $name, $index, &$activesheet, &$firstsheet, &$str_total, &$str_unique, &$str_table, - &$url_format, &$parser) + &$url_format, &$parser, + $tmp_dir) { // It needs to call its parent's constructor explicitly $this->Spreadsheet_Excel_Writer_BIFFwriter(); @@ -460,6 +462,8 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr $this->_input_encoding = ''; $this->_dv = array(); + + $this->_tmp_dir = $tmp_dir; $this->_initialize(); } diff --git a/package.xml b/package.xml index 8b0dfc6..7bc8542 100644 --- a/package.xml +++ b/package.xml @@ -46,6 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> first value of the text [progi1984] - Fix Bug #14932: The name of the Workbook stream MUST be "Workbook", not "Book" [progi1984] +- Fix Bug #14587: tmpfile() used despite setTempDir() [sberg]