Changeset 46754

Timestamp:

11/20/2019 06:47:08 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Customize: If the return URL for Close button is a page added to the Appearance menu by a deactivated theme, fall back to the Themes screen.

Props JarretC, Jean-David, SergeyBiryukov.
Fixes #46686.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)
• tests/phpunit/tests/customize/manager.php (modified) (1 diff)

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

@@ -4623 +4623 @@
          * @since 4.4.0
          *
+         * @global array $_registered_pages
+         *
          * @return string URL for link to close Customizer.
          */
         public function get_return_url() {
+                global $_registered_pages;
+
                 $referer                    = wp_get_referer();
                 $excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
@@ -4638 +4642 @@
                         $return_url = home_url( '/' );
                 }
+
+                $return_url_basename = wp_basename( parse_url( $this->return_url, PHP_URL_PATH ) );
+                $return_url_query    = parse_url( $this->return_url, PHP_URL_QUERY );
+
+                if ( 'themes.php' === $return_url_basename && $return_url_query ) {
+                        parse_str( $return_url_query, $query_vars );
+
+                        /*
+                         * If the return URL is a page added by a theme to the Appearance menu via add_submenu_page(),
+                         * verify that belongs to the active theme, otherwise fall back to the Themes screen.
+                         */
+                        if ( isset( $query_vars['page'] ) && ! isset( $_registered_pages[ "appearance_page_{$query_vars['page']}" ] ) ) {
+                                $return_url = admin_url( 'themes.php' );
+                        }
+                }
+
                 return $return_url;
         }

trunk/tests/phpunit/tests/customize/manager.php

@@ -2831 +2831 @@
 
         /**
+         * @ticket 46686
+         */
+        function test_return_url_with_deactivated_theme() {
+                $this->manager->set_return_url( admin_url( 'themes.php?page=mytheme_documentation' ) );
+                $this->assertEquals( admin_url( 'themes.php' ), $this->manager->get_return_url() );
+        }
+
+        /**
          * Test get_autofocus()/set_autofocus() methods.
          *