diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-21 11:26:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-21 11:26:24 +0000 |
| commit | 19d3483c3824c4d4859e8f14a50cb57d97577938 (patch) | |
| tree | 63d6d648c9ca9e4b10ab6ec34955e5eae5afa0c5 /phpBB/includes/acp/acp_styles.php | |
| parent | 1006e76733d4af412f7ec45301f82c034671d65f (diff) | |
| download | forums-19d3483c3824c4d4859e8f14a50cb57d97577938.tar forums-19d3483c3824c4d4859e8f14a50cb57d97577938.tar.gz forums-19d3483c3824c4d4859e8f14a50cb57d97577938.tar.bz2 forums-19d3483c3824c4d4859e8f14a50cb57d97577938.tar.xz forums-19d3483c3824c4d4859e8f14a50cb57d97577938.zip | |
make sure we always check for a valid directory handle
git-svn-id: file:///svn/phpbb/trunk@8211 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_styles.php')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index f4f7f8e56b..31e99a6b0c 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -637,7 +637,7 @@ parse_css_file = {PARSE_CSS_FILE} } } } - @closedir($dp); + closedir($dp); } unset($installed); @@ -1860,15 +1860,17 @@ parse_css_file = {PARSE_CSS_FILE} $imageset_root = "{$phpbb_root_path}styles/{$style_row['imageset_path']}/imageset/"; - $dh = @opendir($imageset_root); - while (($fname = readdir($dh)) !== false) + if ($dh = @opendir($imageset_root)) { - if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname")) + while (($fname = readdir($dh)) !== false) { - $files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg'; + if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname")) + { + $files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg'; + } } + closedir($dh); } - @closedir($dh); $imageset_lang = array(); |