diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 23:01:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 23:01:19 +0100 |
| commit | 979158f0a2e1ab88685f608e8756ff40248b86cf (patch) | |
| tree | a2c1e8ba17bce08e1439a45ef3529516ad9469a4 /phpBB/install | |
| parent | 541879dc5ce4290d51bf0e888879e3cd9967d1a2 (diff) | |
| parent | c54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff) | |
| download | forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.gz forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.bz2 forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.xz forums-979158f0a2e1ab88685f608e8756ff40248b86cf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
[ticket/9953] Set focus to password on re-authentication
[ticket/9905] Add SQLite to the DSN description
[ticket/9859] Remove years from the credit line.
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index f2b8893499..6e9e764ad8 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -134,7 +134,7 @@ $config_schema = array( 'avatar_filesize' => 'avatar_filesize', 'avatar_max_width' => 'avatar_max_width', 'avatar_max_height' => 'avatar_max_height', - 'default_dateformat' => 'default_dateformat', + 'default_dateformat' => 'phpbb_set_encoding(default_dateformat)', 'board_timezone' => 'board_timezone', 'allow_privmsg' => 'not(privmsg_disable)', 'gzip_compress' => 'gzip_compress', |