Changeset 22752 for trunk/wp-admin/media-new.php

Timestamp:

11/21/2012 12:27:12 PM (14 years ago)

Author:

nacin

Message:

Remove cruft from media-new.php. No need to keep extra parameters around (including post ID, which is always 0 here). see #22083.

File:

• trunk/wp-admin/media-new.php (modified) (3 diffs)

trunk/wp-admin/media-new.php

@@ -22 +22 @@
 wp_enqueue_script( 'media-gallery' );
 
+$errors = array();
 
-// IDs should be integers
-$ID = isset($ID) ? (int) $ID : 0;
-$post_id = isset($post_id)? (int) $post_id : 0;
+unset( $_REQUEST['post_id'] );
 
-// Require an ID for the edit screen
-if ( isset($action) && $action == 'edit' && !$ID )
-        wp_die( __( 'Cheatin’ uh?' ) );
-
-        $errors = array();
-
-        if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
-                wp_die( __( 'Cheatin’ uh?' ) );
-
+if ( $_POST ) {
         if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                 check_admin_referer('media-form');
@@ -47 +38 @@
         }
 
-        if ( isset($_GET['upload-page-form']) ) {
-                $errors = array_merge($errors, (array) media_upload_form_handler());
+        $errors = array_merge($errors, (array) media_upload_form_handler());
 
-                $location = 'upload.php';
-                if ( $errors )
-                        $location .= '?message=3';
+        $location = 'upload.php';
+        if ( $errors )
+                $location .= '?message=3';
 
-                wp_redirect( admin_url($location) );
-                exit;
-        }
-
-        if ( isset( $_REQUEST['post_id'] ) )
-                wp_die( __( 'Cheatin’ uh?' ) );
+        wp_redirect( admin_url($location) );
+        exit;
+}
 
         $title = __('Upload New Media');
@@ -92 +79 @@
         <h2><?php echo esc_html( $title ); ?></h2>
 
-        <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php?inline=&amp;upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">
+        <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo $form_class; ?>" id="file-form">
 
         <?php media_upload_form(); ?>