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

// Set timezone in new installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11900 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-12-29 16:11:04 +00:00
parent fe7be46dbe
commit fffdc9b114
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.inc.php
+1 -2
View File
@@ -113,8 +113,7 @@ $defaultCountry = new Country(Configuration::get('PS_COUNTRY_DEFAULT'), Configur
Context::getContext()->country = $defaultCountry; 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. */ /* 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 */ /* Instantiate cookie */
$cookieLifetime = (time() + (((int)Configuration::get('PS_COOKIE_LIFETIME_BO') > 0 ? (int)Configuration::get('PS_COOKIE_LIFETIME_BO') : 1)* 3600)); $cookieLifetime = (time() + (((int)Configuration::get('PS_COOKIE_LIFETIME_BO') > 0 ? (int)Configuration::get('PS_COOKIE_LIFETIME_BO') : 1)* 3600));
install-new/classes/controllerHttp.php
+4
View File
@@ -106,6 +106,10 @@ abstract class InstallControllerHttp
if (!$session->last_step || !in_array($session->last_step, self::$steps)) if (!$session->last_step || !in_array($session->last_step, self::$steps))
$session->last_step = self::$steps[0]; $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) // Get current step (check first if step is changed, then take it from session)
if (Tools::getValue('step')) if (Tools::getValue('step'))
{ {