WordPress 4.0

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

diff --git a/wp-admin/media.php b/wp-admin/media.php
index 1b750d585a7218919f16d8c1b10fbbfeb7d96400..60abb648f6e5d78b3c51b35c6bde3be1b8caca7e 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);
@@ -80,21 +81,21 @@ case 'edit' :
        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://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";
@@ -102,7 +103,6 @@ case 'edit' :
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2>
 <?php
 echo esc_html( $title );
@@ -117,7 +117,7 @@ if ( current_user_can( 'upload_files' ) ) { ?>
 </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>
@@ -135,7 +135,7 @@ if ( current_user_can( 'upload_files' ) ) { ?>
 
 <?php
 
-       require( './admin-footer.php' );
+       require( ABSPATH . 'wp-admin/admin-footer.php' );
 
        exit;
 
@@ -143,7 +143,4 @@ default:
        wp_redirect( admin_url('upload.php') );
        exit;
 
-endswitch;
-
-
-?>
+}