Changeset 29026 for trunk/src/wp-admin/menu.php

Timestamp:

07/08/2014 05:14:20 PM (11 years ago)

Author:

helen

Message:

When accessing the Customizer from the admin menu, make sure the user is returned to the originating page upon close. We should still investigate the general usage of customize-loader.js moving forward, but this approach fixes the immediate issue. props westonruter. fixes #25457.

File:

• trunk/src/wp-admin/menu.php (modified) (1 diff)

trunk/src/wp-admin/menu.php

@@ -147 +147 @@
 $menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
     $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
-    $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize' );
-    if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
+
+    $customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
+    $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', $customize_url, 'hide-if-no-customize' );
+    unset( $customize_url );
+    if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
         $submenu['themes.php'][10] = array(__( 'Menus' ), 'edit_theme_options', 'nav-menus.php');
+    }
 
 unset( $appearance_cap );