diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 22:56:48 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 22:56:48 +0100 |
| commit | 54ef781d727861105d301f0ed7450d88e925a81c (patch) | |
| tree | 099b4c079579e620f73aacf1f3a345e772d5f145 /phpBB | |
| parent | 410f1fdbc0703305865b0cfbeeb124be632a61fb (diff) | |
| parent | 90c8803d59f05038ba1546c3976d8bddccc389f4 (diff) | |
| download | forums-54ef781d727861105d301f0ed7450d88e925a81c.tar forums-54ef781d727861105d301f0ed7450d88e925a81c.tar.gz forums-54ef781d727861105d301f0ed7450d88e925a81c.tar.bz2 forums-54ef781d727861105d301f0ed7450d88e925a81c.tar.xz forums-54ef781d727861105d301f0ed7450d88e925a81c.zip | |
Merge branch 'ticket/bantu/9348' into develop-olympus
* ticket/bantu/9348:
[ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
Diffstat (limited to 'phpBB')
| -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 efe2bc2962..b6eee8d621 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', |