lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an exit to avoid to have apache hangs.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-05 13:46:28 +02:00
parent c665bfa3ee
commit f97d81701b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/export/export_excel.modules.php
View File

@ -190,7 +190,7 @@ class ExportExcel extends ModeleExports
return -1; return -1;
} }
} }
if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) { if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
$cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM; $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
$cacheSettings = array ( $cacheSettings = array (
@ -426,7 +426,7 @@ class ExportExcel extends ModeleExports
$this->workbook->disconnectWorksheets(); $this->workbook->disconnectWorksheets();
unset($this->workbook); unset($this->workbook);
} }
return 0; return 1;
} }

2
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -95,7 +95,7 @@ class ExportExcel2007 extends ExportExcel
$this->workbook->disconnectWorksheets(); $this->workbook->disconnectWorksheets();
unset($this->workbook); unset($this->workbook);
} }
return 0; return 1;
} }
} }

6
htdocs/exports/export.php
View File

@ -992,7 +992,7 @@ if ($step == 4 && $datatoexport)
if ($step == 5 && $datatoexport) if ($step == 5 && $datatoexport)
{ {
asort($array_selected); asort($array_selected);
llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
@ -1142,6 +1142,7 @@ if ($step == 5 && $datatoexport)
print '</td><td width="50%">&nbsp;</td></tr>'; print '</td><td width="50%">&nbsp;</td></tr>';
print '</table>'; print '</table>';
} }
print '<br>'; print '<br>';
@ -1150,6 +1151,8 @@ llxFooter();
$db->close(); $db->close();
exit; // don't know why but apache hangs with php 5.3.10-1ubuntu3.12 and apache 2.2.2 if i remove this exit or replace with return
/** /**
* Return table name of an alias. For this, we look for the "tablename as alias" in sql string. * Return table name of an alias. For this, we look for the "tablename as alias" in sql string.
@ -1172,4 +1175,3 @@ function getablenamefromfield($code,$sqlmaxforexport)
} }
else return ''; else return '';
} }