makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.

Browse source 
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling 2010-02-17 18:40:22 +00:00
parent 6a9e5ea78f
commit 0ddc370386
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -157,6 +157,7 @@
<li>[Fix] Allow convertors to read in configuration from files. (Bug #57265 - Patch by Dicky)</li> <li>[Fix] Allow convertors to read in configuration from files. (Bug #57265 - Patch by Dicky)</li>
<li>[Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)</li> <li>[Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)</li>
<li>[Fix] Small language correction for the FAQ page. (Bug #57825)</li> <li>[Fix] Small language correction for the FAQ page. (Bug #57825)</li>
<li>[Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)</li>
<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>

5
phpBB/includes/acp/acp_language.php
View file

@ -1120,6 +1120,11 @@ class acp_language
{ {
while (($file = readdir($dp)) !== false) while (($file = readdir($dp)) !== false)
{ {
if (!is_dir($phpbb_root_path . 'language/' . $file))
{
continue;
}
if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt")) if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt"))
{ {
if (!in_array($file, $installed)) if (!in_array($file, $installed))