X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..874d2a2f468a0d1e69aab49b1fe2d9d79d3e1142:/wp-admin/upload.php diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 63771a83..dbdf3100 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -7,11 +7,74 @@ */ /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( !current_user_can('upload_files') ) wp_die( __( 'You do not have permission to upload files.' ) ); +$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid'; +$modes = array( 'grid', 'list' ); + +if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) { + $mode = $_GET['mode']; + update_user_option( get_current_user_id(), 'media_library_mode', $mode ); +} + +if ( 'grid' === $mode ) { + wp_enqueue_media(); + wp_enqueue_script( 'media-grid' ); + wp_enqueue_script( 'media' ); + wp_localize_script( 'media-grid', '_wpMediaGridSettings', array( + 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ), + ) ); + + 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 view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '

' . + '

' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '

' + ) ); + + get_current_screen()->add_help_tab( array( + 'id' => 'attachment-details', + 'title' => __( 'Attachment Details' ), + 'content' => + '

' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '

' . + '

' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '

' . + '

' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '

' + ) ); + + get_current_screen()->set_help_sidebar( + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Media Library' ) . '

' . + '

' . __( 'Support Forums' ) . '

' + ); + + $title = __('Media Library'); + $parent_file = 'upload.php'; + + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + ?> +
+

+ + +

+
+

Switch to the list view.' ); ?>

+
+
+ get_pagenum(); @@ -37,27 +100,12 @@ if ( $doaction ) { } switch ( $doaction ) { - case 'find_detached': - if ( !current_user_can('edit_posts') ) - wp_die( __('You are not allowed to scan for lost attachments.') ); - - $lost = $wpdb->get_col( " - SELECT ID FROM $wpdb->posts - WHERE post_type = 'attachment' AND post_parent > '0' - AND post_parent NOT IN ( - SELECT ID FROM $wpdb->posts - WHERE post_type NOT IN ( 'attachment', '" . join( "', '", get_post_types( array( 'public' => false ) ) ) . "' ) - ) - " ); - - $_REQUEST['detached'] = 1; - break; case 'attach': $parent_id = (int) $_REQUEST['found_post_id']; if ( !$parent_id ) return; - $parent = &get_post( $parent_id ); + $parent = get_post( $parent_id ); if ( !current_user_can( 'edit_post', $parent_id ) ) wp_die( __( 'You are not allowed to edit this post.' ) ); @@ -69,12 +117,14 @@ if ( $doaction ) { continue; $attach[] = $att_id; - clean_attachment_cache( $att_id ); } if ( ! empty( $attach ) ) { - $attach = implode( ',', $attach ); - $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach )", $parent_id ) ); + $attach_string = implode( ',', $attach ); + $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach_string )", $parent_id ) ); + foreach ( $attach as $att_id ) { + clean_attachment_cache( $att_id ); + } } if ( isset( $attached ) ) { @@ -97,7 +147,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to move this post to the trash.' ) ); if ( !wp_trash_post( $post_id ) ) - wp_die( __( 'Error in moving to trash...' ) ); + wp_die( __( 'Error in moving to trash.' ) ); } $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location ); break; @@ -109,7 +159,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to move this post out of the trash.' ) ); if ( !wp_untrash_post( $post_id ) ) - wp_die( __( 'Error in restoring from trash...' ) ); + wp_die( __( 'Error in restoring from trash.' ) ); } $location = add_query_arg( 'untrashed', count( $post_ids ), $location ); break; @@ -121,7 +171,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to delete this post.' ) ); if ( !wp_delete_attachment( $post_id_del ) ) - wp_die( __( 'Error in deleting...' ) ); + wp_die( __( 'Error in deleting.' ) ); } $location = add_query_arg( 'deleted', count( $post_ids ), $location ); break; @@ -130,7 +180,7 @@ if ( $doaction ) { wp_redirect( $location ); exit; } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) { - wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) ); + wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ); exit; } @@ -139,8 +189,6 @@ $wp_list_table->prepare_items(); $title = __('Media Library'); $parent_file = 'upload.php'; -wp_enqueue_script( 'wp-ajax-response' ); -wp_enqueue_script( 'jquery-ui-draggable' ); wp_enqueue_script( 'media' ); add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) ); @@ -150,7 +198,8 @@ get_current_screen()->add_help_tab( array( '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.' ) . '

' + '

' . __( '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.' ) . '

' . + '

' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '

' ) ); get_current_screen()->add_help_tab( array( 'id' => 'actions-links', @@ -168,15 +217,19 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . '

' . __( 'Documentation on Media Library' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Support Forums' ) . '

' ); -require_once('./admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
- -

+ + ' . __('Search results for “%s”') . '', get_search_query() ); ?>

@@ -224,20 +277,16 @@ if ( !empty($message) ) { ?>

-views(); ?> -
-search_box( __( 'Search Media' ), 'media' ); ?> +views(); ?> display(); ?>
-
-