diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:58:27 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:58:27 +0100 |
| commit | e2046444a17473eefe68a67d26a34cd25e3872b5 (patch) | |
| tree | 7094a4c02545c8e9594c1f42d7a5fe8fe95aae92 /phpBB/includes | |
| parent | d2a15d9afe06509ff3e9fe5b6463800f66813783 (diff) | |
| parent | 639110766caf40235768d8eed992745a9ab294b0 (diff) | |
| download | forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar.gz forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar.bz2 forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar.xz forums-e2046444a17473eefe68a67d26a34cd25e3872b5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11361] Make sure that array passed to strtr() has the proper format.
Conflicts:
phpBB/includes/session.php
Diffstat (limited to 'phpBB/includes')
| -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 |