WordPress.org
Get WordPress

Make WordPress Core

Ticket #49178: 49178.1.patch

File 49178.1.patch, 8.7 KB (added by Mista-Flo, 5 years ago)

  • src/wp-admin/upload.php 

    diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php
index 3917ece191..de4f84fdcf 100644
    a b if ( ! current_user_can( 'upload_files' ) ) { 
    1313        wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
    1414}
    1515
     16$message = '';
     17if ( ! empty( $_GET['posted'] ) ) {
     18        $message                = __( 'Media file updated.' );
     19        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
     20        unset( $_GET['posted'] );
     21}
     22
     23if ( ! empty( $_GET['attached'] ) && absint( $_GET['attached'] ) ) {
     24        $attached = absint( $_GET['attached'] );
     25        if ( 1 === $attached ) {
     26                $message = __( 'Media file attached.' );
     27        } else {
     28                /* translators: %s: Number of media files. */
     29                $message = _n( '%s media file attached.', '%s media files attached.', $attached );
     30        }
     31        $message                = sprintf( $message, number_format_i18n( $attached ) );
     32        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
     33        unset( $_GET['detach'], $_GET['attached'] );
     34}
     35
     36if ( ! empty( $_GET['detach'] ) && absint( $_GET['detach'] ) ) {
     37        $detached = absint( $_GET['detach'] );
     38        if ( 1 === $detached ) {
     39                $message = __( 'Media file detached.' );
     40        } else {
     41                /* translators: %s: Number of media files. */
     42                $message = _n( '%s media file detached.', '%s media files detached.', $detached );
     43        }
     44        $message                = sprintf( $message, number_format_i18n( $detached ) );
     45        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
     46        unset( $_GET['detach'], $_GET['attached'] );
     47}
     48
     49if ( ! empty( $_GET['deleted'] ) && absint( $_GET['deleted'] ) ) {
     50        $deleted = absint( $_GET['deleted'] );
     51        if ( 1 === $deleted ) {
     52                $message = __( 'Media file permanently deleted.' );
     53        } else {
     54                /* translators: %s: Number of media files. */
     55                $message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
     56        }
     57        $message                = sprintf( $message, number_format_i18n( $deleted ) );
     58        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
     59        unset( $_GET['deleted'] );
     60}
     61
     62if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
     63        $trashed = absint( $_GET['trashed'] );
     64        if ( 1 === $trashed ) {
     65                $message = __( 'Media file moved to the Trash.' );
     66        } else {
     67                /* translators: %s: Number of media files. */
     68                $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
     69        }
     70        $message                = sprintf( $message, number_format_i18n( $trashed ) );
     71        $message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
     72        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
     73        unset( $_GET['trashed'] );
     74}
     75
     76if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
     77        $untrashed = absint( $_GET['untrashed'] );
     78        if ( 1 == $untrashed ) {
     79                $message = __( 'Media file restored from the Trash.' );
     80        } else {
     81                /* translators: %s: Number of media files. */
     82                $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
     83        }
     84        $message                = sprintf( $message, number_format_i18n( $untrashed ) );
     85        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
     86        unset( $_GET['untrashed'] );
     87}
     88
     89$messages[1] = __( 'Media file updated.' );
     90$messages[2] = __( 'Media file permanently deleted.' );
     91$messages[3] = __( 'Error saving media file.' );
     92$messages[4] = __( 'Media file moved to the Trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
     93$messages[5] = __( 'Media file restored from the Trash.' );
     94
     95if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
     96        $message                = $messages[ $_GET['message'] ];
     97        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
     98}
     99
    16100$mode  = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
    17101$modes = array( 'grid', 'list' );
    18102
    … … if ( 'grid' === $mode ) { 
    94178
    95179                <hr class="wp-header-end">
    96180
     181                <?php if ( ! empty( $message ) ) : ?>
     182                        <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
     183                <?php endif; ?>
     184
    97185                <div class="error hide-if-js">
    98186                        <p>
    99187                        <?php
    … … if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { 
    282370
    283371<hr class="wp-header-end">
    284372
    285 <?php
    286 $message = '';
    287 if ( ! empty( $_GET['posted'] ) ) {
    288         $message                = __( 'Media file updated.' );
    289         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
    290 }
    291 
    292 if ( ! empty( $_GET['attached'] ) && absint( $_GET['attached'] ) ) {
    293         $attached = absint( $_GET['attached'] );
    294         if ( 1 == $attached ) {
    295                 $message = __( 'Media file attached.' );
    296         } else {
    297                 /* translators: %s: Number of media files. */
    298                 $message = _n( '%s media file attached.', '%s media files attached.', $attached );
    299         }
    300         $message                = sprintf( $message, number_format_i18n( $attached ) );
    301         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
    302 }
    303 
    304 if ( ! empty( $_GET['detach'] ) && absint( $_GET['detach'] ) ) {
    305         $detached = absint( $_GET['detach'] );
    306         if ( 1 == $detached ) {
    307                 $message = __( 'Media file detached.' );
    308         } else {
    309                 /* translators: %s: Number of media files. */
    310                 $message = _n( '%s media file detached.', '%s media files detached.', $detached );
    311         }
    312         $message                = sprintf( $message, number_format_i18n( $detached ) );
    313         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
    314 }
    315 
    316 if ( ! empty( $_GET['deleted'] ) && absint( $_GET['deleted'] ) ) {
    317         $deleted = absint( $_GET['deleted'] );
    318         if ( 1 == $deleted ) {
    319                 $message = __( 'Media file permanently deleted.' );
    320         } else {
    321                 /* translators: %s: Number of media files. */
    322                 $message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
    323         }
    324         $message                = sprintf( $message, number_format_i18n( $deleted ) );
    325         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
    326 }
    327 
    328 if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
    329         $trashed = absint( $_GET['trashed'] );
    330         if ( 1 == $trashed ) {
    331                 $message = __( 'Media file moved to the Trash.' );
    332         } else {
    333                 /* translators: %s: Number of media files. */
    334                 $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
    335         }
    336         $message                = sprintf( $message, number_format_i18n( $trashed ) );
    337         $message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
    338         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
    339 }
    340 
    341 if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
    342         $untrashed = absint( $_GET['untrashed'] );
    343         if ( 1 == $untrashed ) {
    344                 $message = __( 'Media file restored from the Trash.' );
    345         } else {
    346                 /* translators: %s: Number of media files. */
    347                 $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
    348         }
    349         $message                = sprintf( $message, number_format_i18n( $untrashed ) );
    350         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
    351 }
    352 
    353 $messages[1] = __( 'Media file updated.' );
    354 $messages[2] = __( 'Media file permanently deleted.' );
    355 $messages[3] = __( 'Error saving media file.' );
    356 $messages[4] = __( 'Media file moved to the Trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
    357 $messages[5] = __( 'Media file restored from the Trash.' );
    358 
    359 if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
    360         $message                = $messages[ $_GET['message'] ];
    361         $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
    362 }
    363 
    364 if ( ! empty( $message ) ) {
    365         ?>
     373<?php if ( ! empty( $message ) ) : ?>
    366374<div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
    367 <?php } ?>
     375<?php endif; ?>
    368376
    369377<form id="posts-filter" method="get">
    370378