WordPress 4.4

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

diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 7154148cdda0d0b819420f22a787994ffc8dabb2..65bb790dae40c0f716e6cb992bd3269a58a7c347 100644 (file)
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -25,6 +25,8 @@ if ( 'grid' === $mode ) {
        wp_enqueue_script( 'media-grid' );
        wp_enqueue_script( 'media' );
 
+       remove_action( 'admin_head', 'wp_admin_canonical_url' );
+
        $q = $_GET;
        // let JS handle this
        unset( $q['s'] );
@@ -126,7 +128,7 @@ if ( $doaction ) {
                                break;
                        foreach ( (array) $post_ids as $post_id ) {
                                if ( !current_user_can( 'delete_post', $post_id ) )
-                                       wp_die( __( 'You are not allowed to move this post to the trash.' ) );
+                                       wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
 
                                if ( !wp_trash_post( $post_id ) )
                                        wp_die( __( 'Error in moving to Trash.' ) );
@@ -138,7 +140,7 @@ if ( $doaction ) {
                                break;
                        foreach ( (array) $post_ids as $post_id ) {
                                if ( !current_user_can( 'delete_post', $post_id ) )
-                                       wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
+                                       wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
 
                                if ( !wp_untrash_post( $post_id ) )
                                        wp_die( __( 'Error in restoring from Trash.' ) );
@@ -150,7 +152,7 @@ if ( $doaction ) {
                                break;
                        foreach ( (array) $post_ids as $post_id_del ) {
                                if ( !current_user_can( 'delete_post', $post_id_del ) )
-                                       wp_die( __( 'You are not allowed to delete this post.' ) );
+                                       wp_die( __( 'You are not allowed to delete this item.' ) );
 
                                if ( !wp_delete_attachment( $post_id_del ) )
                                        wp_die( __( 'Error in deleting.' ) );
@@ -202,6 +204,12 @@ get_current_screen()->set_help_sidebar(
        '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
 );
 
+get_current_screen()->set_screen_reader_content( array(
+       'heading_views'      => __( 'Filter media items list' ),
+       'heading_pagination' => __( 'Media items list navigation' ),
+       'heading_list'       => __( 'Media items list' ),
+) );
+
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>