aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index cb31e3567a..4b40525881 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -345,7 +345,13 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
return false;
}
- $dh = opendir($rootdir . $dir);
+ $dh = @opendir($rootdir . $dir);
+
+ if (!$dh)
+ {
+ return false;
+ }
+
while (($fname = readdir($dh)) !== false)
{
if (is_file("$rootdir$dir$fname"))
@@ -2677,9 +2683,9 @@ function add_permission_language()
// Now search in acp and mods folder for permissions_ files.
foreach (array('acp/', 'mods/') as $path)
{
- $dh = opendir($user->lang_path . $path);
+ $dh = @opendir($user->lang_path . $path);
- if ($dh !== false)
+ if ($dh)
{
while (($file = readdir($dh)) !== false)
{