Преглед изворни кода

#1297: timezone configuration setting was inoperant.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4355 a333f486-631f-4898-b8df-5754b55c2be0
dflaven пре 8 година
родитељ
комит
9f6e6f4a84
3 измењених фајлова са 2 додато и 1 уклоњено
  1. 1 0
      setup/ajax.dataloader.php
  2. 1 0
      setup/index.php
  3. 0 1
      setup/setuppage.class.inc.php

+ 1 - 0
setup/ajax.dataloader.php

@@ -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))

+ 1 - 0
setup/index.php

@@ -36,6 +36,7 @@ ini_set('max_execution_time', max(240, ini_get('max_execution_time')));
 // While running the setup it is desirable to see any error that may happen
 ini_set('display_errors', true);
 ini_set('display_startup_errors', true);
+date_default_timezone_set('Europe/Paris'); // Just to avoid a warning if the timezone is not set in php.ini
 
 /////////////////////////////////////////////////////////////////////
 // Fake functions to protect the first run of the installer

+ 0 - 1
setup/setuppage.class.inc.php

@@ -30,7 +30,6 @@ require_once(APPROOT."setup/runtimeenv.class.inc.php");
 
 define('INSTALL_LOG_FILE', APPROOT.'/log/setup.log');
 
-date_default_timezone_set('Europe/Paris');
 class SetupPage extends NiceWebPage
 {
     public function __construct($sTitle)