Changeset 61601

Timestamp:

02/09/2026 04:53:07 PM (7 months ago)

Author:

SergeyBiryukov

Message:

Filesystem API: Avoid chmod() warnings if the permissions already match.

This prevents spurious warnings from WP_Filesystem_Direct::chmod() when the web process doesn't have ownership over the files, and thus cannot change the permissions, even if only to reassert the existing mode.

Follow-up to [6779], [11667], [12998].

Props redsweater, mukesh27, SergeyBiryukov.
Fixes #64610.

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-direct.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -171 +171 @@
 
                 if ( ! $recursive || ! $this->is_dir( $file ) ) {
+                        $current_mode = fileperms( $file ) & 0777 | 0644;
+
+                        /*
+                         * fileperms() populates the stat cache, so have to clear it
+                         * to maintain parity with the previous behavior.
+                         */
+                        clearstatcache( true, $file );
+
+                        /*
+                         * Avoid calling chmod() if the requested mode is already set,
+                         * to prevent throwing a warning when we aren't the owner.
+                         */
+                        if ( $current_mode === $mode ) {
+                                return true;
+                        }
+
                         return chmod( $file, $mode );
                 }