diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-27 21:40:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-27 21:40:02 +0100 |
| commit | 96b1cabcf2fbc4955bab65a4931f1815548d4df4 (patch) | |
| tree | 16e869447ba1560109604402449c57052ea33d06 /phpBB/includes/datetime.php | |
| parent | 2f6b072bb13ce9d7c7784136bedec651b73ae11b (diff) | |
| parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
| download | forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar.gz forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar.bz2 forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar.xz forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
Diffstat (limited to 'phpBB/includes/datetime.php')
| -rw-r--r-- | phpBB/includes/datetime.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/datetime.php b/phpBB/includes/datetime.php index b3462ddf67..3c6d4971b9 100644 --- a/phpBB/includes/datetime.php +++ b/phpBB/includes/datetime.php @@ -143,7 +143,7 @@ class phpbb_datetime extends DateTime 'is_short' => strpos($format, self::RELATIVE_WRAPPER) !== false, 'format_short' => substr($format, 0, strpos($format, self::RELATIVE_WRAPPER)) . self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER . substr(strrchr($format, self::RELATIVE_WRAPPER), 1), 'format_long' => str_replace(self::RELATIVE_WRAPPER, '', $format), - 'lang' => $user->lang['datetime'], + 'lang' => array_filter($user->lang['datetime'], 'is_string'), ); // Short representation of month in format? Some languages use different terms for the long and short format of May |