--- user-avatar.php (revision 13984)
+++ user-avatar.php (working copy)
@@ -454,12 +454,12 @@
if ( !file_exists( $avatar_folder_dir ) )
return false;
- if ( $av_dir = opendir( $avatar_folder_dir ) ) {
+ if ( is_dir( $avatar_folder_dir ) && $av_dir = opendir( $avatar_folder_dir ) ) {
while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
@unlink( $avatar_folder_dir . '/' . $avatar_file );
}
+ closedir($av_dir);
}
- closedir($av_dir);
@rmdir( $avatar_folder_dir );
@@ -695,7 +695,7 @@
$avatar_folder_dir = USER_AVATAR_UPLOAD_PATH."{$id}/";
$return = false;
- if ( $av_dir = opendir( $avatar_folder_dir ) ) {
+ if ( is_dir( $avatar_folder_dir ) && $av_dir = opendir( $avatar_folder_dir ) ) {
// Stash files in an array once to check for one that matches
$avatar_files = array();
@@ -717,9 +717,11 @@
endif;
}
- }
+
// Close the avatar directory
closedir( $av_dir );
+
+ }
return $return;
}