dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix timezone issues in installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13681 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-28 13:28:29 +00:00
parent cece625999
commit b628bd7b51
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/classes/controllerHttp.php
+2 -1
View File
@@ -112,7 +112,8 @@ abstract class InstallControllerHttp
$session->last_step = self::$steps[0]; $session->last_step = self::$steps[0];
// Set timezone // Set timezone
@date_default_timezone_set($session->shop_timezone ? $session->shop_timezone : 'UTC'); if ($session->shop_timezone)
@date_default_timezone_set($session->shop_timezone);
// Get current step (check first if step is changed, then take it from session) // Get current step (check first if step is changed, then take it from session)
if (Tools::getValue('step')) if (Tools::getValue('step'))
install-dev/init.php
+2
View File
@@ -65,6 +65,8 @@ require_once(_PS_INSTALL_PATH_.'classes/xmlLoader.php');
require_once(_PS_INSTALL_PATH_.'classes/simplexml.php'); require_once(_PS_INSTALL_PATH_.'classes/simplexml.php');
@set_time_limit(0); @set_time_limit(0);
if (!@ini_get('date.timezone'))
@date_default_timezone_set('UTC');
// Try to improve memory limit if it's under 32M // Try to improve memory limit if it's under 32M
if (Tools::getMemoryLimit() < Tools::getOctets('32M')) if (Tools::getMemoryLimit() < Tools::getOctets('32M'))