diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-03-28 16:46:49 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-03-28 16:46:49 +0000 |
| commit | fe9590cf5a3946260d61748cfc2ac0e13f10c23b (patch) | |
| tree | 24ddbbf66a22fbd200cb0626ef8ee45d55ce14f9 /phpBB/includes/functions_user.php | |
| parent | 20e6dbb389b0eef201d192367d54ce3deac03c50 (diff) | |
| download | forums-fe9590cf5a3946260d61748cfc2ac0e13f10c23b.tar forums-fe9590cf5a3946260d61748cfc2ac0e13f10c23b.tar.gz forums-fe9590cf5a3946260d61748cfc2ac0e13f10c23b.tar.bz2 forums-fe9590cf5a3946260d61748cfc2ac0e13f10c23b.tar.xz forums-fe9590cf5a3946260d61748cfc2ac0e13f10c23b.zip | |
- Bug 1301
git-svn-id: file:///svn/phpbb/trunk@5743 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c34f16c1e0..bb52d36471 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1058,16 +1058,16 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var // Collect images $dp = @opendir($path); - while ($file = readdir($dp)) + while (($file = readdir($dp)) !== false) { if ($file{0} != '.' && is_dir("$path/$file")) { $avatar_row_count = $avatar_col_count = 0; $dp2 = @opendir("$path/$file"); - while ($sub_file = readdir($dp2)) + while (($sub_file = readdir($dp2)) !== false) { - if (preg_match('#\.(gif$|png$|jpg|jpeg)$#i', $sub_file)) + if (preg_match('#\.(?:gif|png|jpe?g)$#i', $sub_file)) { $avatar_list[$file][$avatar_row_count][$avatar_col_count] = array( 'file' => "$file/$sub_file", |