Changeset 36261

Timestamp:

01/11/2016 06:50:30 PM (9 years ago)

Author:

westonruter

Message:

Customizer: Prevent erroneously directing user to login screen when closing.

Fixes issue where user gets stuck at login screen after trying to close the app if previously they had to first login to access the Customizer. Prevents WP_Customize_Manager::get_return_url() from using wp-login.php as a referer.

Props chandrapatel.
See #32637.
Fixes #35355.

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

@@ -1580 +1580 @@
     public function get_return_url() {
         $referer = wp_get_referer();
+        $excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
+
         if ( $this->return_url ) {
             $return_url = $this->return_url;
-        } else if ( $referer && 'customize.php' !== basename( parse_url( $referer, PHP_URL_PATH ) ) ) {
+        } else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
             $return_url = $referer;
         } else if ( $this->preview_url ) {

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

@@ -321 +321 @@
 
         $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'customize.php' ) );
+        $this->assertEquals( $preview_url, $this->manager->get_return_url() );
+
+        // See #35355.
+        $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'wp-login.php' ) );
         $this->assertEquals( $preview_url, $this->manager->get_return_url() );