X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b3ddbea8a296025a672b3c3ddca158dc51ed8080..cd3609994b39a094ff7528b93f55631bb213fd7f:/wp-admin/upload.php
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index e1212070..d1723274 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -90,6 +90,8 @@ if ( $doaction ) {
}
break;
case 'trash':
+ if ( !isset( $post_ids ) )
+ 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.' ) );
@@ -100,6 +102,8 @@ if ( $doaction ) {
$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
break;
case 'untrash':
+ if ( !isset( $post_ids ) )
+ 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.' ) );
@@ -110,6 +114,8 @@ if ( $doaction ) {
$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
break;
case 'delete':
+ if ( !isset( $post_ids ) )
+ 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.' ) );
@@ -139,11 +145,27 @@ wp_enqueue_script( 'media' );
add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
-add_contextual_help( $current_screen,
- '' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '
' .
- '' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '
' .
- '' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file’s name displays a simple screen to edit that individual file’s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '
' .
- '' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '
' .
+get_current_screen()->add_help_tab( array(
+'id' => 'overview',
+'title' => __('Overview'),
+'content' =>
+ '' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '
' .
+ '' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '
'
+) );
+get_current_screen()->add_help_tab( array(
+'id' => 'actions-links',
+'title' => __('Available Actions'),
+'content' =>
+ '' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file’s name displays a simple screen to edit that individual file’s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '
'
+) );
+get_current_screen()->add_help_tab( array(
+'id' => 'attaching-files',
+'title' => __('Attaching Files'),
+'content' =>
+ '' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '
'
+) );
+
+get_current_screen()->set_help_sidebar(
'' . __( 'For more information:' ) . '
' .
'' . __( 'Documentation on Media Library' ) . '
' .
'' . __( 'Support Forums' ) . '
'
@@ -154,37 +176,41 @@ require_once('./admin-header.php');
-
+
+ ' . __('Search results for “%s”') . '', get_search_query() ); ?>
' . __('Undo') . '';
$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
}
-if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
- $message = sprintf( _n( 'Media attachment restored from the trash.', '%d media attachments restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
+if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
+ $message = sprintf( _n( 'Media attachment restored from the trash.', '%d media attachments restored from the trash.', $untrashed ), number_format_i18n( $_GET['untrashed'] ) );
$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
}
@@ -194,8 +220,8 @@ $messages[3] = __('Error saving media attachment.');
$messages[4] = __('Media moved to the trash.') . '
' . __('Undo') . '';
$messages[5] = __('Media restored from the trash.');
-if ( isset($_GET['message']) && (int) $_GET['message'] ) {
- $message = $messages[$_GET['message']];
+if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
+ $message = $messages[ $_GET['message'] ];
$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
}