diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:50:04 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:50:04 +0100 |
| commit | 639110766caf40235768d8eed992745a9ab294b0 (patch) | |
| tree | d507560e6d4c8c3adf6faafc4340555f2e528e43 /phpBB | |
| parent | 678ec7b545e6780b1192d6fdf358692c9431bb17 (diff) | |
| parent | ae3a22bd0c06bd6098c229963402d660572a0598 (diff) | |
| download | forums-639110766caf40235768d8eed992745a9ab294b0.tar forums-639110766caf40235768d8eed992745a9ab294b0.tar.gz forums-639110766caf40235768d8eed992745a9ab294b0.tar.bz2 forums-639110766caf40235768d8eed992745a9ab294b0.tar.xz forums-639110766caf40235768d8eed992745a9ab294b0.zip | |
Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympus
* github-bantu/ticket/11361:
[ticket/11361] Make sure that array passed to strtr() has the proper format.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/session.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index d980f50e05..b93f2ff65e 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -2156,7 +2156,8 @@ class user extends session 'is_short' => strpos($format, '|'), 'format_short' => substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1), '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 |