composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-02 23:18:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

(retrofit from trunk) #1297: timezone configuration setting was inoperant.

Browse Source 
SVN:2.3[4356]
This commit is contained in:
Denis Flaven
2016-08-29 12:52:51 +00:00
parent 40b3e8290b
commit dc9a6382f9
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/ajax.dataloader.php
View File

@@ -47,6 +47,7 @@ require_once(APPROOT.'/setup/setuppage.class.inc.php');
require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');
ini_set('max_execution_time', max(3600, ini_get('max_execution_time'))); // Under Windows SQL/backup operations are part of the timeout and require extra time
date_default_timezone_set('Europe/Paris'); // Just to avoid a warning if the timezone is not set in php.ini
$sMemoryLimit = trim(ini_get('memory_limit'));
if (empty($sMemoryLimit))