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

[feature/new-tz-handling] Require user argument on phpbb_datetime

Browse source 
PHPBB3-9558
This commit is contained in:
Joas Schilling 2012-07-16 18:29:31 +02:00
parent 82e195ac68
commit f5bb145040
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/datetime.php
View file

@ -35,10 +35,9 @@ class phpbb_datetime extends DateTime
* @param DateTimeZone $timezone Time zone of the time. * @param DateTimeZone $timezone Time zone of the time.
* @param user User object for context. * @param user User object for context.
*/ */
public function __construct($time = 'now', DateTimeZone $timezone = null, $user = null) public function __construct($user, $time = 'now', DateTimeZone $timezone = null)
{ {
$this->user = $user ?: $GLOBALS['user']; $this->user = $user;
$timezone = $timezone ?: $this->user->tz; $timezone = $timezone ?: $this->user->tz;
parent::__construct($time, $timezone); parent::__construct($time, $timezone);
@ -56,7 +55,7 @@ class phpbb_datetime extends DateTime
$format = $format ? $format : $this->user->date_format; $format = $format ? $format : $this->user->date_format;
$format = self::format_cache($format, $this->user); $format = self::format_cache($format, $this->user);
$relative = ($format['is_short'] && !$force_absolute); $relative = ($format['is_short'] && !$force_absolute);
$now = new self('now', $this->user->tz, $this->user); $now = new self($this->user, 'now', $this->user->tz);
$timestamp = $this->getTimestamp(); $timestamp = $this->getTimestamp();
$now_ts = $now->getTimeStamp(); $now_ts = $now->getTimeStamp();

4
phpBB/includes/functions.php
View file

@ -1164,7 +1164,7 @@ function tz_select($default = '', $truncate = false, $return_tzs_only = true)
foreach ($unsorted_timezones as $timezone) foreach ($unsorted_timezones as $timezone)
{ {
$tz = new DateTimeZone($timezone); $tz = new DateTimeZone($timezone);
$dt = new phpbb_datetime('now', $tz, $user); $dt = new phpbb_datetime($user, 'now', $tz);
$offset = $dt->getOffset(); $offset = $dt->getOffset();
$current_time = $dt->format($user->lang['DATETIME_FORMAT'], true); $current_time = $dt->format($user->lang['DATETIME_FORMAT'], true);
$offset_string = phpbb_format_timezone_offset($offset); $offset_string = phpbb_format_timezone_offset($offset);
@ -4813,7 +4813,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
} }
} }
$dt = new phpbb_datetime('now', $user->tz, $user); $dt = new phpbb_datetime($user, 'now', $user->tz);
$timezone_offset = 'GMT' . phpbb_format_timezone_offset($dt->getOffset()); $timezone_offset = 'GMT' . phpbb_format_timezone_offset($dt->getOffset());
$timezone_name = $user->tz->getName(); $timezone_name = $user->tz->getName();
if (isset($user->lang['timezones'][$timezone_name])) if (isset($user->lang['timezones'][$timezone_name]))

4
phpBB/includes/user.php
View file

@ -631,7 +631,7 @@ class phpbb_user extends phpbb_session
$utc = new DateTimeZone('UTC'); $utc = new DateTimeZone('UTC');
} }
$time = new phpbb_datetime("@$gmepoch", $utc, $this); $time = new phpbb_datetime($this, "@$gmepoch", $utc);
$time->setTimezone($this->tz); $time->setTimezone($this->tz);
return $time->format($format, $forcedate); return $time->format($format, $forcedate);
@ -648,7 +648,7 @@ class phpbb_user extends phpbb_session
public function create_datetime($time = 'now', DateTimeZone $timezone = null) public function create_datetime($time = 'now', DateTimeZone $timezone = null)
{ {
$timezone = $timezone ?: $this->tz; $timezone = $timezone ?: $this->tz;
return new phpbb_datetime($time, $timezone, $this); return new phpbb_datetime($this, $time, $timezone);
} }
/** /**