WordPress.org
Get WordPress

Make WordPress Core

Changeset 61311


Ignore:
Timestamp:
11/26/2025 09:50:02 PM (7 weeks ago)
Author:
SergeyBiryukov
Message:

Filesystem API: Check for the correct result in some WP_Filesystem_FTPext methods.

This avoids a PHP warning when ::dirlist() returns false under certain conditions:

Warning: Trying to access array offset on value of type bool in wp-admin/includes/class-wp-filesystem-ftpsockets.php on line 326

Follow-up to [6779], [30678], [45226].

Props apermo, malt3, SergeyBiryukov.
Fixes #63474.

Location:
trunk/src/wp-admin/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php

    r61116 r61311  
    300300        $dir = $this->dirlist( $file );
    301301
    302         return $dir[ $file ]['owner'];
     302        return $dir[ $file ]['owner'] ?? '';
    303303    }
    304304
    … …  
    314314        $dir = $this->dirlist( $file );
    315315
    316         return $dir[ $file ]['permsn'];
     316        return $dir[ $file ]['permsn'] ?? '';
    317317    }
    318318
    … …  
    328328        $dir = $this->dirlist( $file );
    329329
    330         return $dir[ $file ]['group'];
     330        return $dir[ $file ]['group'] ?? '';
    331331    }
    332332

  • trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

    r60275 r61311  
    310310        $dir = $this->dirlist( $file );
    311311
    312         return $dir[ $file ]['owner'];
     312        return $dir[ $file ]['owner'] ?? '';
    313313    }
    314314
    … …  
    324324        $dir = $this->dirlist( $file );
    325325
    326         return $dir[ $file ]['permsn'];
     326        return $dir[ $file ]['permsn'] ?? '';
    327327    }
    328328
    … …  
    338338        $dir = $this->dirlist( $file );
    339339
    340         return $dir[ $file ]['group'];
     340        return $dir[ $file ]['group'] ?? '';
    341341    }
    342342
Note: See TracChangeset for help on using the changeset viewer.