makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/new-tz-handling] Do not use underscore as prefix for user

Browse source 
PHPBB3-9558
This commit is contained in:
Joas Schilling 2012-06-18 11:03:10 +02:00
parent c21275fa95
commit 2a880dafdf
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/datetime.php
View file

@ -21,7 +21,7 @@ class phpbb_datetime extends DateTime
/** /**
* @var user User who is the context for this DateTime instance * @var user User who is the context for this DateTime instance
*/ */
protected $_user; protected $user;
/** /**
* @var array Date formats are preprocessed by phpBB, to save constant recalculation they are cached. * @var array Date formats are preprocessed by phpBB, to save constant recalculation they are cached.
@ -38,9 +38,9 @@ class phpbb_datetime extends DateTime
*/ */
public function __construct($time = 'now', DateTimeZone $timezone = null, $user = null) public function __construct($time = 'now', DateTimeZone $timezone = null, $user = null)
{ {
$this->_user = $user ? $user : $GLOBALS['user']; $this->user = $user ?: $GLOBALS['user'];
$timezone = (!$timezone && $this->_user->tz instanceof DateTimeZone) ? $this->_user->tz : $timezone; $timezone = (!$timezone && $this->user->tz instanceof DateTimeZone) ? $this->user->tz : $timezone;
parent::__construct($time, $timezone); parent::__construct($time, $timezone);
} }
@ -72,10 +72,10 @@ class phpbb_datetime extends DateTime
*/ */
public function format($format = '', $force_absolute = false) public function format($format = '', $force_absolute = false)
{ {
$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('now', $this->user->tz, $this->user);
$timestamp = $this->getTimestamp(); $timestamp = $this->getTimestamp();
$now_ts = $now->getTimeStamp(); $now_ts = $now->getTimeStamp();
@ -88,9 +88,9 @@ class phpbb_datetime extends DateTime
// and the delta not more than a minute in the past // and the delta not more than a minute in the past
// and the delta is either greater than -5 seconds or timestamp and current time are of the same minute (they must be in the same hour already) // and the delta is either greater than -5 seconds or timestamp and current time are of the same minute (they must be in the same hour already)
// finally check that relative dates are supported by the language pack // finally check that relative dates are supported by the language pack
if ($delta <= 3600 && $delta > -60 && ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) && isset($this->_user->lang['datetime']['AGO'])) if ($delta <= 3600 && $delta > -60 && ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) && isset($this->user->lang['datetime']['AGO']))
{ {
return $this->_user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60))); return $this->user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60)));
} }
else else
{ {
@ -117,7 +117,7 @@ class phpbb_datetime extends DateTime
if ($day !== false) if ($day !== false)
{ {
// Format using the short formatting and finally swap out the relative token placeholder with the correct value // Format using the short formatting and finally swap out the relative token placeholder with the correct value
return str_replace(self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER, $this->_user->lang['datetime'][$day], strtr(parent::format($format['format_short']), $format['lang'])); return str_replace(self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER, $this->user->lang['datetime'][$day], strtr(parent::format($format['format_short']), $format['lang']));
} }
} }
} }