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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-12-27 19:14:03 +01:00
commit a4a57b5860
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/datetime.php
View file

@ -60,6 +60,12 @@ class 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;
if (substr($this->user->lang_name, 0,2) != 'en')
{
$format = preg_replace('/([^\\\])S/','$1', $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($this->user, 'now', $this->user->timezone); $now = new self($this->user, 'now', $this->user->timezone);