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-06-25 10:10:14 +02:00
commit 1b3bdddfd1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
phpBB/phpbb/user.php
View file

@ -588,6 +588,7 @@ class user extends \phpbb\session
*/ */
function format_date($gmepoch, $format = false, $forcedate = false) function format_date($gmepoch, $format = false, $forcedate = false)
{ {
global $phpbb_dispatcher;
static $utc; static $utc;
if (!isset($utc)) if (!isset($utc))
@ -595,10 +596,34 @@ class user extends \phpbb\session
$utc = new \DateTimeZone('UTC'); $utc = new \DateTimeZone('UTC');
} }
$time = new $this->datetime($this, '@' . (int) $gmepoch, $utc); $format_date_override = false;
$time->setTimezone($this->timezone); $function_arguments = func_get_args();
/**
* Execute code and/or override format_date()
*
* To override the format_date() function generated value
* set $format_date_override to new return value
*
* @event core.user_format_date_override
* @var DateTimeZone utc Is DateTimeZone in UTC
* @var array function_arguments is array comprising a function's argument list
* @var string format_date_override Shall we return custom format (string) or not (false)
* @since 3.2.1-RC1
*/
$vars = array('utc', 'function_arguments', 'format_date_override');
extract($phpbb_dispatcher->trigger_event('core.user_format_date_override', compact($vars)));
return $time->format($format, $forcedate); if (!$format_date_override)
{
$time = new $this->datetime($this, '@' . (int) $gmepoch, $utc);
$time->setTimezone($this->timezone);
return $time->format($format, $forcedate);
}
else
{
return $format_date_override;
}
} }
/** /**