makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/new-tz-handling] Replace user::$timezone with user::$tz.

Browse source 
user::$tz will store the new DateTimeZone object representing the users
timezone instead of the existing user::$timezone and user::$dst combination.

PHPBB3-9558
This commit is contained in:
Chris Smith 2010-07-07 22:17:40 +01:00 • committed by Oleg Pudeyev
parent 9e1812a0ca
commit 6a783b843b
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/includes/session.php
View file

@ -1528,7 +1528,14 @@ class user extends session
var $help = array(); var $help = array();
var $theme = array(); var $theme = array();
var $date_format; var $date_format;
var $timezone;
/**
* Users current timezone
*
* @var DateTimeZone Timezone of the user
* @since 3.1
*/
public $tz;
var $lang_name = false; var $lang_name = false;
var $lang_id = false; var $lang_id = false;
@ -1586,13 +1593,13 @@ class user extends session
$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']); $this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
$this->date_format = $this->data['user_dateformat']; $this->date_format = $this->data['user_dateformat'];
$this->timezone = $this->data['user_timezone']; $this->tz = $this->data['user_timezone'];
} }
else else
{ {
$this->lang_name = basename($config['default_lang']); $this->lang_name = basename($config['default_lang']);
$this->date_format = $config['default_dateformat']; $this->date_format = $config['default_dateformat'];
$this->timezone = $config['board_timezone']; $this->tz = $config['board_timezone'];
/** /**
* If a guest user is surfing, we try to guess his/her language first by obtaining the browser language * If a guest user is surfing, we try to guess his/her language first by obtaining the browser language
@ -1631,13 +1638,13 @@ class user extends session
*/ */
} }
if (is_numeric($this->timezone)) if (is_numeric($this->tz))
{ {
// Might still be numeric by chance // Might still be numeric by chance
$this->timezone = sprintf('Etc/GMT%+d', ($this->timezone + ($this->data['user_id'] != ANONYMOUS ? $this->data['user_dst'] : $config['board_dst']))); $this->tz = sprintf('Etc/GMT%+d', ($this->tz + ($this->data['user_id'] != ANONYMOUS ? $this->data['user_dst'] : $config['board_dst'])));
} }
$this->timezone = new DateTimeZone($this->timezone); $this->tz = new DateTimeZone($this->tz);
// We include common language file here to not load it every time a custom language file is included // We include common language file here to not load it every time a custom language file is included
$lang = &$this->lang; $lang = &$this->lang;