Changeset 35635

Timestamp:

11/13/2015 05:24:28 AM (9 years ago)

Author:

westonruter

Message:

Customize: Exclude referer URL from being used for Close link if it is customize.php.

This fixes an edge case where the Close button could never link the user out of the Customizer, if the user initially accessed it without a url param and then clicked a link (provided by a plugin) that took them to another customize.php URL.

See #32637.

Location:

trunk

Files:

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

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

@@ -1477 +1477 @@
         if ( $this->return_url ) {
             $return_url = $this->return_url;
-        } else if ( $referer ) {
+        } else if ( $referer && 'customize.php' !== basename( parse_url( $referer, PHP_URL_PATH ) ) ) {
             $return_url = $referer;
         } else if ( $this->preview_url ) {

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

@@ -261 +261 @@
         $preview_url = home_url( '/foo/' );
         $this->manager->set_preview_url( $preview_url );
+        $this->assertEquals( $preview_url, $this->manager->get_return_url() );
+
+        $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'customize.php' ) );
         $this->assertEquals( $preview_url, $this->manager->get_return_url() );