From fab93cc99feec11b4f7abbfbd6d793ec07237df4 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 1 Dec 2010 19:28:24 +0000
Subject: [PATCH] Define IFRAME_REQUEST only if not inline.  Props ocean90.
 fixes #15630

git-svn-id: http://svn.automattic.com/wordpress/trunk@16661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/media-upload.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 71f64d93e..4a15cc30d 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -9,7 +9,8 @@
  * @subpackage Administration
  */
 
-define('IFRAME_REQUEST' , true);
+if ( ! isset( $_GET['inline'] ) )
+	define( 'IFRAME_REQUEST' , true );
 
 /** Load WordPress Administration Bootstrap */
 require_once('./admin.php');