The branch, master has been updated via ea8cc56becd008beb4cb9c5e7a4eb39195c2128a (commit) via a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) via e5ceb497df8563f73296d7fc894ff00101e21bde (commit) via 62c149e38dba1fe6ebfb604c86d6167f9b052b46 (commit) from 7337fe5a0c74817214004b5524850f5a166046d4 (commit) - Log ----------------------------------------------------------------- commit ea8cc56becd008beb4cb9c5e7a4eb39195c2128a Merge: 62c149e38dba1fe6ebfb604c86d6167f9b052b46 a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 Author: Michal Čihař <mcihar@novell.com> Date: Fri Apr 9 15:27:39 2010 +0200 Merge branch 'QA_3_3' commit 62c149e38dba1fe6ebfb604c86d6167f9b052b46 Author: Michal Čihař <mcihar@novell.com> Date: Fri Apr 9 15:26:37 2010 +0200 Revert part of eb5e03880e579d572ec8e45a8fc0777929defddc. XLSX writer does not have setTempDir method. ----------------------------------------------------------------------- Summary of changes: libraries/export/xlsx.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 86a17a9..1b24c4c 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -59,7 +59,6 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_'); $workbookWriter = new PHPExcel_Writer_Excel2007($workbook); - $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { hooks/post-receive -- phpMyAdmin