Changeset 22751
- Timestamp:
- 11/21/2012 12:19:40 PM (13 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 1 edited
- 1 copied
-
media-new.php (copied) (copied from trunk/wp-admin/media-upload.php) (5 diffs)
-
media-upload.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/media-new.php
r22746 r22751 9 9 * @subpackage Administration 10 10 */ 11 12 if ( ! isset( $_GET['inline'] ) )13 define( 'IFRAME_REQUEST' , true );14 11 15 12 /** Load WordPress Administration Bootstrap */ … … 25 22 wp_enqueue_script( 'media-gallery' ); 26 23 27 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));28 24 29 25 // IDs should be integers … … 35 31 wp_die( __( 'Cheatin’ uh?' ) ); 36 32 37 if ( isset($_GET['inline']) ) {38 33 $errors = array(); 39 34 … … 97 92 <h2><?php echo esc_html( $title ); ?></h2> 98 93 99 <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media- upload.php?inline=&upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">94 <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php?inline=&upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form"> 100 95 101 96 <?php media_upload_form(); ?> … … 121 116 <?php 122 117 include('./admin-footer.php'); 123 124 } else {125 if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )126 wp_die( __( 'Cheatin’ uh?' ) );127 128 // upload type: image, video, file, ..?129 if ( isset($_GET['type']) )130 $type = strval($_GET['type']);131 else132 $type = apply_filters('media_upload_default_type', 'file');133 134 // tab: gallery, library, or type-specific135 if ( isset($_GET['tab']) )136 $tab = strval($_GET['tab']);137 else138 $tab = apply_filters('media_upload_default_tab', 'type');139 140 $body_id = 'media-upload';141 142 // let the action code decide how to handle the request143 if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) )144 do_action("media_upload_$type");145 else146 do_action("media_upload_$tab");147 } -
trunk/wp-admin/media-upload.php
r22663 r22751 35 35 wp_die( __( 'Cheatin’ uh?' ) ); 36 36 37 if ( isset($_GET['inline']) ) {38 $errors = array();39 40 if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )41 wp_die( __( 'Cheatin’ uh?' ) );42 43 if ( isset($_POST['html-upload']) && !empty($_FILES) ) {44 check_admin_referer('media-form');45 // Upload File button was clicked46 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);47 unset($_FILES);48 if ( is_wp_error($id) ) {49 $errors['upload_error'] = $id;50 $id = false;51 }52 }53 54 if ( isset($_GET['upload-page-form']) ) {55 $errors = array_merge($errors, (array) media_upload_form_handler());56 57 $location = 'upload.php';58 if ( $errors )59 $location .= '?message=3';60 61 wp_redirect( admin_url($location) );62 exit;63 }64 65 if ( isset( $_REQUEST['post_id'] ) )66 wp_die( __( 'Cheatin’ uh?' ) );67 68 $title = __('Upload New Media');69 $parent_file = 'upload.php';70 get_current_screen()->add_help_tab( array(71 'id' => 'overview',72 'title' => __('Overview'),73 'content' =>74 '<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>' .75 '<ul>' .76 '<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .77 '<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>' .78 '<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .79 '</ul>' .80 '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'81 ) );82 get_current_screen()->set_help_sidebar(83 '<p><strong>' . __('For more information:') . '</strong></p>' .84 '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .85 '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'86 );87 88 require_once('./admin-header.php');89 90 $form_class = 'media-upload-form wp-upload-form type-form validate';91 92 if ( get_user_setting('uploader') )93 $form_class .= ' html-uploader';94 ?>95 <div class="wrap">96 <?php screen_icon(); ?>97 <h2><?php echo esc_html( $title ); ?></h2>98 99 <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">100 101 <?php media_upload_form(); ?>102 103 <script type="text/javascript">104 jQuery(function($){105 var preloaded = $(".media-item.preloaded");106 if ( preloaded.length > 0 ) {107 preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});108 }109 updateMediaForm();110 post_id = 0;111 shortform = 1;112 });113 </script>114 <input type="hidden" name="post_id" id="post_id" value="0" />115 <?php wp_nonce_field('media-form'); ?>116 <div id="media-items" class="hide-if-no-js"></div>117 <?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>118 </form>119 </div>120 121 <?php122 include('./admin-footer.php');123 124 } else {125 37 if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) 126 38 wp_die( __( 'Cheatin’ uh?' ) ); … … 145 57 else 146 58 do_action("media_upload_$tab"); 147 }
Note: See TracChangeset
for help on using the changeset viewer.