Clientbase
/
Spreadsheet_Excel_Writer
mirror of https://github.com/basemaster/Spreadsheet_Excel_Writer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Bug #14587: tmpfile() used despite setTempDir() [sberg] 

git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@287055 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Christian Weiske 2009-08-10 19:47:52 +00:00
parent e95501071c
commit f935c52a11
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spreadsheet/Excel/Writer/Workbook.php
View File

@ -337,7 +337,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
$this->_activesheet, $this->_firstsheet, $this->_activesheet, $this->_firstsheet,
$this->_str_total, $this->_str_unique, $this->_str_total, $this->_str_unique,
$this->_str_table, $this->_url_format, $this->_str_table, $this->_url_format,
$this->_parser); $this->_parser, $this->_tmp_dir);
$this->_worksheets[$index] = &$worksheet; // Store ref for iterator $this->_worksheets[$index] = &$worksheet; // Store ref for iterator
$this->_sheetnames[$index] = $name; // Store EXTERNSHEET names $this->_sheetnames[$index] = $name; // Store EXTERNSHEET names

6
Spreadsheet/Excel/Writer/Worksheet.php
View File

@ -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 &$firstsheet The first worksheet in the workbook we belong to
* @param mixed &$url_format The default format for hyperlinks * @param mixed &$url_format The default format for hyperlinks
* @param mixed &$parser The formula parser created for the Workbook * @param mixed &$parser The formula parser created for the Workbook
* @param string $tmp_dir The path to the directory for temporary files
* @access private * @access private
*/ */
function Spreadsheet_Excel_Writer_Worksheet($BIFF_version, $name, function Spreadsheet_Excel_Writer_Worksheet($BIFF_version, $name,
$index, &$activesheet, $index, &$activesheet,
&$firstsheet, &$str_total, &$firstsheet, &$str_total,
&$str_unique, &$str_table, &$str_unique, &$str_table,
&$url_format, &$parser) &$url_format, &$parser,
$tmp_dir)
{ {
// It needs to call its parent's constructor explicitly // It needs to call its parent's constructor explicitly
$this->Spreadsheet_Excel_Writer_BIFFwriter(); $this->Spreadsheet_Excel_Writer_BIFFwriter();
@ -461,6 +463,8 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
$this->_dv = array(); $this->_dv = array();
$this->_tmp_dir = $tmp_dir;
$this->_initialize(); $this->_initialize();
} }

1
package.xml
View File

@ -46,6 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
first value of the text [progi1984] first value of the text [progi1984]
- Fix Bug #14932: The name of the Workbook stream MUST be "Workbook", not - Fix Bug #14932: The name of the Workbook stream MUST be "Workbook", not
"Book" [progi1984] "Book" [progi1984]
- Fix Bug #14587: tmpfile() used despite setTempDir() [sberg]
</notes> </notes>
<contents> <contents>