diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-04 17:41:39 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-04 17:41:39 +0100 |
| commit | ec143edaf1aa5957671712e12a6af196c8d9452b (patch) | |
| tree | b482537393b92245ddc503b3621244da721a65a2 /phpBB/includes/acp/acp_language.php | |
| parent | bdc590aac89ec654c075f2b0327bc5f61cd0e402 (diff) | |
| parent | 36a4c410cedf876bf1c532037e8d49a3cb5d86cc (diff) | |
| download | forums-ec143edaf1aa5957671712e12a6af196c8d9452b.tar forums-ec143edaf1aa5957671712e12a6af196c8d9452b.tar.gz forums-ec143edaf1aa5957671712e12a6af196c8d9452b.tar.bz2 forums-ec143edaf1aa5957671712e12a6af196c8d9452b.tar.xz forums-ec143edaf1aa5957671712e12a6af196c8d9452b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9966] Language download in ACP creates index.html and misses captcha_*
Diffstat (limited to 'phpBB/includes/acp/acp_language.php')
| -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 f32fe4c0ae..8df8e5c8e5 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -1070,14 +1070,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(); @@ -1232,7 +1232,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"); } /** |