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] Check the is_short flag stored inside the format array.

Browse source 
Reuse the existing check store in the format array to determine if the date time
format supports relative formatting.

PHPBB3-9558
This commit is contained in:
Chris Smith 2010-07-07 22:47:34 +01:00 • committed by Oleg Pudeyev
parent 8fe46175af
commit 5dd7916c49
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/datetime.php
View file

@ -73,7 +73,8 @@ 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;
$relative = (strpos($format, self::RELATIVE_WRAPPER) !== false && !$force_absolute); $format = self::_format_cache($format, $this->_user);
$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();
@ -114,8 +115,6 @@ class phpbb_datetime extends DateTime
if ($day !== false) if ($day !== false)
{ {
$format = self::_format_cache($format, $this->_user);
// 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']));
} }