WP Merge.

Delete feed code and sql


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@636 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 1 insertions, 16 deletions

diff --git a/wp-admin/inline-uploading.php b/wp-admin/inline-uploading.php
index ca9f945..c5c969d 100644
--- a/wp-admin/inline-uploading.php
+++ b/wp-admin/inline-uploading.php
@@ -7,22 +7,7 @@ header('Content-Type: text/html; charset=' . get_option('blog_charset'));
 if (!current_user_can('upload_files'))

 	die(__('You do not have permission to upload files.'));

 

-$wpvarstoreset = array('action', 'post', 'all', 'last', 'link', 'sort', 'start', 'imgtitle', 'descr', 'attachment');

-

-for ($i=0; $i<count($wpvarstoreset); $i += 1) {

-	$wpvar = $wpvarstoreset[$i];

-	if (!isset($$wpvar)) {

-		if (empty($_POST["$wpvar"])) {

-			if (empty($_GET["$wpvar"])) {

-				$$wpvar = '';

-			} else {

-			$$wpvar = $_GET["$wpvar"];

-			}

-		} else {

-			$$wpvar = $_POST["$wpvar"];

-		}

-	}

-}

+wp_reset_vars(array('action', 'post', 'all', 'last', 'link', 'sort', 'start', 'imgtitle', 'descr', 'attachment'));

 

 $post = (int) $post;

 $images_width = 1;