Changeset 52415

Timestamp:

12/25/2021 03:30:27 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Administration: Make sure the $customize_url variable is always defined in the admin menu.

This avoids an Undefined variable PHP warning when displaying other admin menu items.

Follow-up to [52069], [52134], [52158], [52178], [52414].

Props afragen.
Fixes #54682.

File:

• trunk/src/wp-admin/menu.php (modified) (2 diffs)

trunk/src/wp-admin/menu.php

@@ -215 +215 @@
 }
 
-// Hide Customize link on block themes unless a plugin or theme is using
-// customize_register to add a setting.
+$customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
+
+// Hide Customize link on block themes unless a plugin or theme
+// is using 'customize_register' to add a setting.
 if ( ! wp_is_block_theme() || has_action( 'customize_register' ) ) {
-    $customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
-    $position      = wp_is_block_theme() ? 7 : 6;
+    $position = wp_is_block_theme() ? 7 : 6;
 
     $submenu['themes.php'][ $position ] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
@@ -238 +239 @@
 }
 
-    unset( $customize_url );
+unset( $customize_url );
 
 unset( $appearance_cap );