Ticket #32637: 32637.3.patch

wp-admin/customize.php

@@ -1 @@
-<?php
+        <?php
 /**
  * Theme Customize Screen.
  *
@@ -26 +26 @@
 if ( ! $return ) {
         if ( $url ) {
                 $return = $url;
-        } elseif ( current_user_can( 'edit_theme_options' ) || current_user_can( 'switch_themes' ) ) {
-                $return = admin_url( 'themes.php' );
+        } elseif ( 
+                ( current_user_can( 'edit_theme_options' ) || current_user_can( 'switch_themes' ) ) ||
+                ( isset( $_SERVER['HTTP_REFERER'] ) && false !== strpos( $_SERVER['HTTP_REFERER'], admin_url() ) )
+        ) {
+                $return = admin_url();
         } else {
-                $return = admin_url();
+                $return = home_url( '/' );
         }
 }