Changeset 36363

Timestamp:

01/20/2016 08:36:17 AM (9 years ago)

Author:

dd32

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.

Merges [36261] to the 4.4 branch.
Props chandrapatel.
See #32637.
Fixes #35355.

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/class-wp-customize-manager.php

@@ -1536 +1536 @@
     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 ) {

branches/4.4/tests/phpunit/tests/customize/manager.php

@@ -322 +322 @@
 
         $_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() );