Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
This commit is contained in:
commit
0c331602e8
@ -48,6 +48,17 @@ if (! empty($conf->syslog->enabled))
|
|||||||
*/
|
*/
|
||||||
if ($action=='purge' && ! preg_match('/^confirm/i', $choice) && ($choice != 'allfiles' || $confirm == 'yes') )
|
if ($action=='purge' && ! preg_match('/^confirm/i', $choice) && ($choice != 'allfiles' || $confirm == 'yes') )
|
||||||
{
|
{
|
||||||
|
// Increase limit of time. Works only if we are not in safe mode
|
||||||
|
$ExecTimeLimit=600;
|
||||||
|
if (!empty($ExecTimeLimit))
|
||||||
|
{
|
||||||
|
$err=error_reporting();
|
||||||
|
error_reporting(0); // Disable all errors
|
||||||
|
//error_reporting(E_ALL);
|
||||||
|
@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
|
||||||
|
error_reporting($err);
|
||||||
|
}
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
|
||||||
$utils = new Utils($db);
|
$utils = new Utils($db);
|
||||||
$result = $utils->purgeFiles($choice);
|
$result = $utils->purgeFiles($choice);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user