mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-09 07:58:56 +02:00
Merge branch 'ticket/nickvergessen/9966' into develop-olympus
* ticket/nickvergessen/9966: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
This commit is contained in:
commit
36a4c410ce
@ -1055,14 +1055,14 @@ class acp_language
|
|||||||
$iso_src .= htmlspecialchars_decode($row['lang_author']);
|
$iso_src .= htmlspecialchars_decode($row['lang_author']);
|
||||||
$compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt');
|
$compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt');
|
||||||
|
|
||||||
// index.html files
|
// index.htm files
|
||||||
$compress->add_data('', 'language/' . $row['lang_iso'] . '/index.html');
|
$compress->add_data('', 'language/' . $row['lang_iso'] . '/index.htm');
|
||||||
$compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.html');
|
$compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.htm');
|
||||||
$compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.html');
|
$compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.htm');
|
||||||
|
|
||||||
if (sizeof($mod_files))
|
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();
|
$compress->close();
|
||||||
@ -1217,7 +1217,7 @@ $lang = array_merge($lang, array(
|
|||||||
';
|
';
|
||||||
|
|
||||||
// Language files in language root directory
|
// 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");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user