Changeset 14157

Timestamp:

12/18/2025 10:54:12 PM (5 months ago)

Author:

espellcaste

Message:

Core: improve PHP8 compatibility by only calling closedir() on proper opendir() resources.

The intent of this change is to avoid closedir() producing warnings & errors when opendir() had previously returned false.

It also adds a missing closedir() call to the bp_attachments_cover_image_generate_file() function.

Props GaryJ.

Fixes #9307 (14.0)

Location:

branches/14.0/src/bp-core

Files:

• bp-core-attachments.php (modified) (4 diffs)
• bp-core-avatars.php (modified) (4 diffs)

branches/14.0/src/bp-core/bp-core-attachments.php

@@ -531 +531 @@
         $file = false;
 
-        // Open the directory and get the first file.
+        // Open the directory.
         $att_dir = opendir( $type_dir );
         if ( $att_dir ) {
@@ -542 +542 @@
                 }
             }
+
+            // Close the directory.
+            closedir( $att_dir );
         }
 
@@ -1346 +1349 @@
     $cover_basename = wp_basename( $cover_file );
 
-    if ( $att_dir = opendir( $args['cover_image_dir'] ) ) {
+    // Open the directory.
+    $att_dir = opendir( $args['cover_image_dir'] );
+    if ( $att_dir ) {
         while ( false !== ( $attachment_file = readdir( $att_dir ) ) ) {
             // Skip directories and the new cover image.
@@ -1353 +1358 @@
             }
         }
+
+        // Close the directory.
+        closedir( $att_dir );
     }
 

branches/14.0/src/bp-core/bp-core-avatars.php

@@ -526 +526 @@
     if ( ! $params['force_default'] && file_exists( $avatar_folder_dir ) ) {
 
-        // Open directory.
-        if ( $av_dir = opendir( $avatar_folder_dir ) ) {
+        // Open the directory.
+        $av_dir = opendir( $avatar_folder_dir );
+        if ( $av_dir ) {
 
             // Stash files in an array once to check for one that matches.
@@ -566 +567 @@
                 }
             }
-        }
-
-        // Close the avatar directory.
-        closedir( $av_dir );
+
+            // Close the directory.
+            closedir( $av_dir );
+        }
 
         // If we found a locally uploaded avatar.
@@ -856 +857 @@
     }
 
-    if ( $av_dir = opendir( $avatar_folder_dir ) ) {
+    $av_dir = opendir( $avatar_folder_dir );
+    if ( $av_dir ) {
         while ( false !== ( $avatar_file = readdir( $av_dir ) ) ) {
             if ( ( preg_match( '/-bpfull/', $avatar_file ) || preg_match( '/-bpthumb/', $avatar_file ) ) && '.' !== $avatar_file && '..' !== $avatar_file ) {
@@ -862 +864 @@
             }
         }
-    }
-    closedir( $av_dir );
+
+        // Close the directory.
+        closedir( $av_dir );
+    }
 
     @rmdir( $avatar_folder_dir );