WordPress 4.2.2-scripts

[autoinstalls/wordpress.git] / wp-admin / media.php

diff --git a/wp-admin/media.php b/wp-admin/media.php
index 8626674f463388b18b5fc086d75814c90d340d68..62b2401be4d505df3a1479783e6b646d8c7ed4a1 100644 (file)
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -7,14 +7,14 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 $parent_file = 'upload.php';
 $submenu_file = 'upload.php';
 
 wp_reset_vars(array('action'));
 
-switch( $action ) :
+switch ( $action ) {
 case 'editattachment' :
        $attachment_id = (int) $_POST['attachment_id'];
        check_admin_referer('media-form');
@@ -40,7 +40,7 @@ case 'editattachment' :
                exit;
        }
 
-       // no break
+       // No break.
 case 'edit' :
        $title = __('Edit Media');
 
@@ -59,6 +59,7 @@ case 'edit' :
        $att = get_post($att_id);
 
        if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
+       if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
        if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
 
        add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
@@ -67,28 +68,34 @@ case 'edit' :
        wp_enqueue_script('image-edit');
        wp_enqueue_style('imgareaselect');
 
-       add_contextual_help( $current_screen,
-       '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-       '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-       '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-       '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>' .
+       get_current_screen()->add_help_tab( array(
+               'id'      => 'overview',
+               'title'   => __('Overview'),
+               'content' =>
+                       '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
+                       '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
+                       '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
+                       '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</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#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-);
+       '<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       );
 
-       require( './admin-header.php' );
+       require( ABSPATH . 'wp-admin/admin-header.php' );
 
        $parent_file = 'upload.php';
        $message = '';
        $class = '';
        if ( isset($_GET['message']) ) {
-               switch ( $_GET['message'] ) :
-               case 'updated' :
-                       $message = __('Media attachment updated.');
-                       $class = 'updated';
-                       break;
-               endswitch;
+               switch ( $_GET['message'] ) {
+                       case 'updated' :
+                               $message = __('Media attachment updated.');
+                               $class = 'updated';
+                               break;
+               }
        }
        if ( $message )
                echo "<div id='message' class='$class'><p>$message</p></div>\n";
@@ -96,7 +103,6 @@ case 'edit' :
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2>
 <?php
 echo esc_html( $title );
@@ -105,13 +111,13 @@ if ( current_user_can( 'upload_files' ) ) { ?>
 <?php } ?>
 </h2>
 
-<form method="post" action="" class="media-upload-form" id="media-single-form">
+<form method="post" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
 <?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
 </p>
 
 <div class="media-single">
-<div id='media-item-<?php echo $att_id; ?>' class='media-item'>
+<div id="media-item-<?php echo $att_id; ?>" class="media-item">
 <?php echo get_media_item( $att_id, array( 'toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => !empty($errors[$att_id]) ? $errors[$att_id] : null ) ); ?>
 </div>
 </div>
@@ -129,7 +135,7 @@ if ( current_user_can( 'upload_files' ) ) { ?>
 
 <?php
 
-       require( './admin-footer.php' );
+       require( ABSPATH . 'wp-admin/admin-footer.php' );
 
        exit;
 
@@ -137,7 +143,4 @@ default:
        wp_redirect( admin_url('upload.php') );
        exit;
 
-endswitch;
-
-
-?>
+}