diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-20 17:58:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-20 17:58:27 +0000 |
| commit | 31e546c5e4ecd012ef9d93fa68f42c793e417303 (patch) | |
| tree | 205934c32a9aff1bf4369b1f157d5d55abc1f3f6 /phpBB/includes/acp/acp_language.php | |
| parent | fae887b3a106fef9fb5828f636402d5323ba300d (diff) | |
| download | forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.gz forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.bz2 forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.xz forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.zip | |
- fixing some bugs
- removing utf8 characters from email files (has been discussed internally, you guys know why)
- making sure some opendir calls are checked before calling readdir.
git-svn-id: file:///svn/phpbb/trunk@6912 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_language.php')
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index e83445eeed..a5b7974d70 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -940,31 +940,35 @@ class acp_language $db->sql_freeresult($result); $new_ary = $iso = array(); - $dp = opendir("{$phpbb_root_path}language"); + $dp = @opendir("{$phpbb_root_path}language"); - while (($file = readdir($dp)) !== false) + if ($dp) { - if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt")) + while (($file = readdir($dp)) !== false) { - if (!in_array($file, $installed)) + if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt")) { - if ($iso = file("{$phpbb_root_path}language/$file/iso.txt")) + if (!in_array($file, $installed)) { - if (sizeof($iso) == 3) + if ($iso = file("{$phpbb_root_path}language/$file/iso.txt")) { - $new_ary[$file] = array( - 'iso' => $file, - 'name' => trim($iso[0]), - 'local_name'=> trim($iso[1]), - 'author' => trim($iso[2]) - ); + if (sizeof($iso) == 3) + { + $new_ary[$file] = array( + 'iso' => $file, + 'name' => trim($iso[0]), + 'local_name'=> trim($iso[1]), + 'author' => trim($iso[2]) + ); + } } } } } + closedir($dp); } + unset($installed); - @closedir($dp); if (sizeof($new_ary)) { |