Ticket #32637: 32637.5.diff

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

@@ -1398 +1398 @@
          * @return string
          */
         public function get_return_url() {
+                $referer = wp_get_referer();
                 if ( $this->return_url ) {
                         $return_url = $this->return_url;
+                } else if ( $referer ) {
+                        $return_url = $referer;
                 } else if ( $this->preview_url ) {
                         $return_url = $this->preview_url;
-                } else if ( current_user_can( 'edit_theme_options' ) || current_user_can( 'switch_themes' ) ) {
-                        $return_url = admin_url( 'themes.php' );
                 } else {
-                        $return_url = admin_url();
+                        $return_url = home_url( '/' );
                 }
                 return $return_url;
         }

tests/phpunit/tests/customize/manager.php

@@ -252 +252 @@
          */
         function test_return_url() {
                 wp_set_current_user( $this->factory->user->create( array( 'role' => 'author' ) ) );
-                $this->assertEquals( get_admin_url(), $this->manager->get_return_url() );
+                $this->assertEquals( home_url( '/' ), $this->manager->get_return_url() );
 
                 wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
                 $this->assertTrue( current_user_can( 'edit_theme_options' ) );
-                $this->assertEquals( admin_url( 'themes.php' ), $this->manager->get_return_url() );
+                $this->assertEquals( home_url( '/' ), $this->manager->get_return_url() );
 
                 $preview_url = home_url( '/foo/' );
                 $this->manager->set_preview_url( $preview_url );
                 $this->assertEquals( $preview_url, $this->manager->get_return_url() );
 
+                $url = home_url( '/referred/' );
+                $_SERVER['HTTP_REFERER'] = wp_slash( $url );
+                $this->assertEquals( $url, $this->manager->get_return_url() );
+
+                $url = 'http://badreferer.example.com/';
+                $_SERVER['HTTP_REFERER'] = wp_slash( $url );
+                $this->assertNotEquals( $url, $this->manager->get_return_url() );
+                $this->assertEquals( $preview_url, $this->manager->get_return_url() );
+
                 $this->manager->set_return_url( admin_url( 'edit.php?trashed=1' ) );
                 $this->assertEquals( admin_url( 'edit.php' ), $this->manager->get_return_url() );
         }