makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympus

Browse source 
* github-bantu/ticket/11361:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
This commit is contained in:
Nils Adermann 2013-02-24 17:50:04 +01:00
commit 639110766c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/session.php
View file

@ -2156,7 +2156,8 @@ class user extends session
'is_short' => strpos($format, '|'), 'is_short' => strpos($format, '|'),
'format_short' => substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1), 'format_short' => substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1),
'format_long' => str_replace('|', '', $format), 'format_long' => str_replace('|', '', $format),
'lang' => $this->lang['datetime'], // Filter out values that are not strings (e.g. arrays) for strtr().
'lang' => array_filter($this->lang['datetime'], 'is_string'),
); );
// Short representation of month in format? Some languages use different terms for the long and short format of May // Short representation of month in format? Some languages use different terms for the long and short format of May