Changeset 35483 for trunk/src/wp-admin/includes/theme.php

Timestamp:

11/01/2015 06:39:50 AM (9 years ago)

Author:

westonruter

Message:

Customize: Return user to referring URL when leaving Customizer in absence of return query param.

When referring URL is not available, default returning user to frontend URL instead of admin URL. Themes page is updated to include the return path in Customizer links.

Props McGuive7, westonruter.
Fixes #32637.

File:

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

trunk/src/wp-admin/includes/theme.php

@@ -526 +526 @@
         }
 
+        $customize_action = null;
+        if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+            $customize_action = esc_url( add_query_arg(
+                array(
+                    'return' => urlencode( esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+                ),
+                wp_customize_url( $slug )
+            ) );
+        }
+
         $prepared_themes[ $slug ] = array(
             'id'           => $slug,
@@ -541 +551 @@
             'actions'      => array(
                 'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
-                'customize' => ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) ? wp_customize_url( $slug ) : null,
+                'customize' => $customize_action,
                 'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
             ),