Changeset 60414 for trunk

Timestamp:

07/05/2025 02:27:23 PM (7 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Remove redundant conditional in WP_Customize_Manager.

This check would always be true, as ::handle_changeset_trash_request() returns early a few lines above if $changeset_post_id is false.

Follow-up to [41667], [48211].

Props justlevine.
See #63268.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3166 +3166 @@
         }
 
-        if ( $changeset_post_id ) {
-            if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
-                wp_send_json_error(
-                    array(
-                        'code'    => 'changeset_trash_unauthorized',
-                        'message' => __( 'Unable to trash changes.' ),
-                    )
-                );
-            }
-
-            $lock_user = (int) wp_check_post_lock( $changeset_post_id );
-
-            if ( $lock_user && get_current_user_id() !== $lock_user ) {
-                wp_send_json_error(
-                    array(
-                        'code'     => 'changeset_locked',
-                        'message'  => __( 'Changeset is being edited by other user.' ),
-                        'lockUser' => $this->get_lock_user_data( $lock_user ),
-                    )
-                );
-            }
+        if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
+            wp_send_json_error(
+                array(
+                    'code'    => 'changeset_trash_unauthorized',
+                    'message' => __( 'Unable to trash changes.' ),
+                )
+            );
+        }
+
+        $lock_user = (int) wp_check_post_lock( $changeset_post_id );
+
+        if ( $lock_user && get_current_user_id() !== $lock_user ) {
+            wp_send_json_error(
+                array(
+                    'code'     => 'changeset_locked',
+                    'message'  => __( 'Changeset is being edited by other user.' ),
+                    'lockUser' => $this->get_lock_user_data( $lock_user ),
+                )
+            );
         }