diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-04 17:36:14 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-04 17:36:14 +0100 |
| commit | 36a4c410cedf876bf1c532037e8d49a3cb5d86cc (patch) | |
| tree | 6a571f37f2cc0b695469cfa1f25d46ebce7a4111 /phpBB | |
| parent | 181f2551cfc82e119d73f462268813d18de06097 (diff) | |
| parent | 72fbd4dffaf35df9740aad558bd8075581492c8b (diff) | |
| download | forums-36a4c410cedf876bf1c532037e8d49a3cb5d86cc.tar forums-36a4c410cedf876bf1c532037e8d49a3cb5d86cc.tar.gz forums-36a4c410cedf876bf1c532037e8d49a3cb5d86cc.tar.bz2 forums-36a4c410cedf876bf1c532037e8d49a3cb5d86cc.tar.xz forums-36a4c410cedf876bf1c532037e8d49a3cb5d86cc.zip | |
Merge branch 'ticket/nickvergessen/9966' into develop-olympus
* ticket/nickvergessen/9966:
[ticket/9966] Language download in ACP creates index.html and misses captcha_*
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index c2cb2f9c11..598b390302 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -1055,14 +1055,14 @@ class acp_language $iso_src .= htmlspecialchars_decode($row['lang_author']); $compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt'); - // index.html files - $compress->add_data('', 'language/' . $row['lang_iso'] . '/index.html'); - $compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.html'); - $compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.html'); + // index.htm files + $compress->add_data('', 'language/' . $row['lang_iso'] . '/index.htm'); + $compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.htm'); + $compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.htm'); if (sizeof($mod_files)) { - $compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.html'); + $compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.htm'); } $compress->close(); @@ -1217,7 +1217,7 @@ $lang = array_merge($lang, array( '; // Language files in language root directory - $this->main_files = array("common.$phpEx", "groups.$phpEx", "install.$phpEx", "mcp.$phpEx", "memberlist.$phpEx", "posting.$phpEx", "search.$phpEx", "ucp.$phpEx", "viewforum.$phpEx", "viewtopic.$phpEx", "help_bbcode.$phpEx", "help_faq.$phpEx"); + $this->main_files = array("captcha_qa.$phpEx", "captcha_recaptcha.$phpEx", "common.$phpEx", "groups.$phpEx", "install.$phpEx", "mcp.$phpEx", "memberlist.$phpEx", "posting.$phpEx", "search.$phpEx", "ucp.$phpEx", "viewforum.$phpEx", "viewtopic.$phpEx", "help_bbcode.$phpEx", "help_faq.$phpEx"); } /** |