Commit 0286bc8117 for wordpress.org
commit 0286bc811710987d22986bb3c70f302d434bf87c
Author: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed Nov 26 21:52:32 2025 +0000
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.
Built from https://develop.svn.wordpress.org/trunk@61311
git-svn-id: http://core.svn.wordpress.org/trunk@60623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 15ab0faa43..0ab4bc17c3 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -299,7 +299,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
public function owner( $file ) {
$dir = $this->dirlist( $file );
- return $dir[ $file ]['owner'];
+ return $dir[ $file ]['owner'] ?? '';
}
/**
@@ -313,7 +313,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
public function getchmod( $file ) {
$dir = $this->dirlist( $file );
- return $dir[ $file ]['permsn'];
+ return $dir[ $file ]['permsn'] ?? '';
}
/**
@@ -327,7 +327,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
public function group( $file ) {
$dir = $this->dirlist( $file );
- return $dir[ $file ]['group'];
+ return $dir[ $file ]['group'] ?? '';
}
/**
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 986fccf2cf..cc665ad9bf 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -309,7 +309,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
public function owner( $file ) {
$dir = $this->dirlist( $file );
- return $dir[ $file ]['owner'];
+ return $dir[ $file ]['owner'] ?? '';
}
/**
@@ -323,7 +323,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
public function getchmod( $file ) {
$dir = $this->dirlist( $file );
- return $dir[ $file ]['permsn'];
+ return $dir[ $file ]['permsn'] ?? '';
}
/**
@@ -337,7 +337,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
public function group( $file ) {
$dir = $this->dirlist( $file );
- return $dir[ $file ]['group'];
+ return $dir[ $file ]['group'] ?? '';
}
/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0abbb62179..aadc6b0f7e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '7.0-alpha-61310';
+$wp_version = '7.0-alpha-61311';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.