diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-02-17 18:40:22 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2010-02-17 18:40:22 +0000 |
| commit | 0ddc3703869733546e836f68761d1f42498386b4 (patch) | |
| tree | aeba016e7ec0d9079669a1166ac5f4ffe2620464 /phpBB | |
| parent | 6a9e5ea78f3bf418bf9fa617a251d11786a92e60 (diff) | |
| download | forums-0ddc3703869733546e836f68761d1f42498386b4.tar forums-0ddc3703869733546e836f68761d1f42498386b4.tar.gz forums-0ddc3703869733546e836f68761d1f42498386b4.tar.bz2 forums-0ddc3703869733546e836f68761d1f42498386b4.tar.xz forums-0ddc3703869733546e836f68761d1f42498386b4.zip | |
Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6e4b9d6de5..2e2b228771 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -157,6 +157,7 @@ <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] 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] 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> diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 8ca45a27f6..fedae6fe67 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -1120,6 +1120,11 @@ class acp_language { 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 (!in_array($file, $installed)) |