Ticket #15509: 15509-network-admin.patch

wp-admin/network/plugin-install.php

@@ -7 +7 @@
  * @since 3.1.0
  */
 
+if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+        define( 'IFRAME_REQUEST' , true );
+
 /** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 

wp-admin/network/theme-install.php

@@ -7 +7 @@
  * @since 3.1.0
  */
 
+if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
+        define( 'IFRAME_REQUEST', true );
+
 /** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 

wp-admin/plugin-install.php

@@ -6 +6 @@
  * @subpackage Administration
  */
 // TODO route this pages via a specific iframe handler instead of the do_action below
-if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
-        define('IFRAME_REQUEST' , true);
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+        define( 'IFRAME_REQUEST' , true );
 
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');

wp-admin/theme-install.php

@@ -6 +6 @@
  * @subpackage Administration
  */
 
-if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
         define( 'IFRAME_REQUEST', true );
         
 /** WordPress Administration Bootstrap */