diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-04 19:32:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-04 19:32:23 +0000 |
| commit | 57b188b7afa66b68ef75ee69bc06cd8f14b3fed1 (patch) | |
| tree | 676d8f5348e2c790664127dd651774543bd9bf75 /phpBB/includes/functions_user.php | |
| parent | 68d73caefcf084f5f523ee7a47b84112dedd4e21 (diff) | |
| download | forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.gz forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.bz2 forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.xz forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.zip | |
my turn to break the forum (and at least pm's are no longer working - will not last long). HARRRR
git-svn-id: file:///svn/phpbb/trunk@4978 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c058cd2b9d..92cd42d521 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1038,10 +1038,15 @@ function avatar_upload($data, &$error) function avatar_gallery($category, &$error) { - global $config; + global $config, $phpbb_root_path, $user; $path = $phpbb_root_path . $config['avatar_gallery_path']; + if (!file_exists($path) || !is_dir($path)) + { + return array($user->lang['NONE'] => array()); + } + // To be replaced with SQL ... before M3 completion $dp = @opendir($path); @@ -1073,6 +1078,11 @@ function avatar_gallery($category, &$error) } closedir($dp); + if (!sizeof($data)) + { + return array($user->lang['NONE'] => array()); + } + @ksort($data); return $data; |