Changeset 22751 for trunk/wp-admin/media-upload.php

Timestamp:

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

Author:

nacin

Message:

Split media-new.php and media-upload.php into distinct files.

• media-new.php will remain the entry point for uploading isolated files, and for using the browser-based uploader (versus Plupload).
• media-upload.php is the legacy (pre-3.5) media uploader.

see #22083.

File:

• trunk/wp-admin/media-upload.php (modified) (2 diffs)

trunk/wp-admin/media-upload.php

@@ -35 +35 @@
         wp_die( __( 'Cheatin’ uh?' ) );
 
-if ( isset($_GET['inline']) ) {
-        $errors = array();
-
-        if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
-                wp_die( __( 'Cheatin’ uh?' ) );
-
-        if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-                check_admin_referer('media-form');
-                // Upload File button was clicked
-                $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-                unset($_FILES);
-                if ( is_wp_error($id) ) {
-                        $errors['upload_error'] = $id;
-                        $id = false;
-                }
-        }
-
-        if ( isset($_GET['upload-page-form']) ) {
-                $errors = array_merge($errors, (array) media_upload_form_handler());
-
-                $location = 'upload.php';
-                if ( $errors )
-                        $location .= '?message=3';
-
-                wp_redirect( admin_url($location) );
-                exit;
-        }
-
-        if ( isset( $_REQUEST['post_id'] ) )
-                wp_die( __( 'Cheatin’ uh?' ) );
-
-        $title = __('Upload New Media');
-        $parent_file = 'upload.php';
-        get_current_screen()->add_help_tab( array(
-        'id'            => 'overview',
-        'title'         => __('Overview'),
-        'content'       =>
-                '<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-                '<ul>' .
-                        '<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-                        '<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-                        '<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
-                '</ul>' .
-                '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
-        ) );
-        get_current_screen()->set_help_sidebar(
-                '<p><strong>' . __('For more information:') . '</strong></p>' .
-                '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
-                '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-        );
-
-        require_once('./admin-header.php');
-
-        $form_class = 'media-upload-form wp-upload-form type-form validate';
-
-        if ( get_user_setting('uploader') )
-                $form_class .= ' html-uploader';
-        ?>
-        <div class="wrap">
-        <?php screen_icon(); ?>
-        <h2><?php echo esc_html( $title ); ?></h2>
-
-        <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">
-
-        <?php media_upload_form(); ?>
-
-        <script type="text/javascript">
-        jQuery(function($){
-                var preloaded = $(".media-item.preloaded");
-                if ( preloaded.length > 0 ) {
-                        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-                }
-                updateMediaForm();
-                post_id = 0;
-                shortform = 1;
-        });
-        </script>
-        <input type="hidden" name="post_id" id="post_id" value="0" />
-        <?php wp_nonce_field('media-form'); ?>
-        <div id="media-items" class="hide-if-no-js"></div>
-        <?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>
-        </form>
-        </div>
-
-<?php
-        include('./admin-footer.php');
-
-} else {
         if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
                 wp_die( __( 'Cheatin&#8217; uh?' ) );
@@ -145 +57 @@
         else
                 do_action("media_upload_$tab");
-}