// Set timezone in new installer

This commit is contained in:
rMalie
2011-12-29 16:11:04 +00:00
parent de584ee4a1
commit 2ca6350545
2 changed files with 5 additions and 2 deletions
+1 -2
View File
@@ -113,8 +113,7 @@ $defaultCountry = new Country(Configuration::get('PS_COUNTRY_DEFAULT'), Configur
Context::getContext()->country = $defaultCountry;
/* It is not safe to rely on the system's timezone settings, and this would generate a PHP Strict Standards notice. */
if (function_exists('date_default_timezone_set'))
@date_default_timezone_set(Configuration::get('PS_TIMEZONE'));
@date_default_timezone_set(Configuration::get('PS_TIMEZONE'));
/* Instantiate cookie */
$cookieLifetime = (time() + (((int)Configuration::get('PS_COOKIE_LIFETIME_BO') > 0 ? (int)Configuration::get('PS_COOKIE_LIFETIME_BO') : 1)* 3600));
+4
View File
@@ -106,6 +106,10 @@ abstract class InstallControllerHttp
if (!$session->last_step || !in_array($session->last_step, self::$steps))
$session->last_step = self::$steps[0];
// Set timezone
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)
if (Tools::getValue('step'))
{