WP Merge

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

1 files changed, 3 insertions, 3 deletions

diff --git a/wp-admin/inline-uploading.php b/wp-admin/inline-uploading.php
index 601f530..ca9f945 100644
--- a/wp-admin/inline-uploading.php
+++ b/wp-admin/inline-uploading.php
@@ -41,7 +41,7 @@ if ( !current_user_can('edit_post', (int) $attachment) )
 

 wp_delete_attachment($attachment);

 

-header("Location: " . basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start");

+wp_redirect(basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start");

 die;

 

 case 'save':

@@ -105,7 +105,7 @@ if ( preg_match('!^image/!', $attachment['post_mime_type']) ) {
 	add_post_meta($id, '_wp_attachment_metadata', array());

 }

 

-header("Location: " . basename(__FILE__) . "?post=$post&all=$all&action=view&start=0");

+wp_redirect(basename(__FILE__) . "?post=$post&all=$all&action=view&start=0");

 die();

 

 case 'upload':

@@ -144,7 +144,7 @@ if ( '' == $sort )
 $attachments = $wpdb->get_results("SELECT ID, post_date, post_title, post_mime_type, guid FROM $wpdb->posts WHERE post_type = 'attachment' $and_type $and_post $and_user ORDER BY $sort LIMIT $start, $double", ARRAY_A);

 

 if ( count($attachments) == 0 ) {

-	header("Location: " . basename(__FILE__) ."?post=$post&action=upload" );

+	wp_redirect( basename(__FILE__) ."?post=$post&action=upload" );

 	die;

 } elseif ( count($attachments) > $num ) {

 	$next = $start + count($attachments) - $num;