WordPress.org

Make WordPress Core

Ticket #11299: 11299.diff

File 11299.diff, 5.3 KB (added by caesarsgrunt, 5 years ago)
  • wp-admin/edit-comments.php

     
    154154                if ( $spammed > 0 ) { 
    155155                        printf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ); 
    156156                        $ids = isset($_GET['ids']) ? $_GET['ids'] : 0; 
    157                         echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo?') . '</a><br />'; 
     157                        echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />'; 
    158158                } 
    159159                if ( $unspammed > 0 ) { 
    160160                        printf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed ); 
     
    163163                if ( $trashed > 0 ) { 
    164164                        printf( _n( '%s comment moved to the trash.', '%s comments moved to the trash.', $trashed ), $trashed ); 
    165165                        $ids = isset($_GET['ids']) ? $_GET['ids'] : 0; 
    166                         echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo?') . '</a><br />'; 
     166                        echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />'; 
    167167                } 
    168168                if ( $untrashed > 0 ) { 
    169169                        printf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed ); 
  • wp-admin/includes/media.php

     
    12331233                if ( !EMPTY_TRASH_DAYS ) 
    12341234                        $delete = "<a href=\"" . wp_nonce_url("post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Delete Permanently') . "</a>"; 
    12351235                else 
    1236                         $delete = "<a href=\"" . wp_nonce_url("post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Move to Trash') . "</a> <a href=\"" . wp_nonce_url("post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id) . "\" id=\"undo[$attachment_id]\" class=\"undo hidden\">" . __('Undo?') . "</a>"; 
     1236                        $delete = "<a href=\"" . wp_nonce_url("post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Move to Trash') . "</a> <a href=\"" . wp_nonce_url("post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id) . "\" id=\"undo[$attachment_id]\" class=\"undo hidden\">" . __('Undo') . "</a>"; 
    12371237        } else { 
    12381238                $delete = ''; 
    12391239        } 
  • wp-admin/upload.php

     
    206206$messages[1] = __('Media attachment updated.'); 
    207207$messages[2] = __('Media permanently deleted.'); 
    208208$messages[3] = __('Error saving media attachment.'); 
    209 $messages[4] = __('Media 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>'; 
     209$messages[4] = __('Media 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>'; 
    210210$messages[5] = __('Media restored from the trash.'); 
    211211 
    212212if ( isset($_GET['message']) && (int) $_GET['message'] ) { 
  • wp-admin/edit.php

     
    168168if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) { 
    169169        printf( _n( 'Post moved to the trash.', '%s posts moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) ); 
    170170        $ids = isset($_GET['ids']) ? $_GET['ids'] : 0; 
    171         echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo?') . '</a><br />'; 
     171        echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />'; 
    172172        unset($_GET['trashed']); 
    173173} 
    174174 
  • wp-admin/edit-pages.php

     
    167167if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) { 
    168168        printf( _n( 'Page moved to the trash.', '%s pages moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) ); 
    169169        $ids = isset($_GET['ids']) ? $_GET['ids'] : 0; 
    170         echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo?') . '</a><br />'; 
     170        echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo') . '</a><br />'; 
    171171        unset($_GET['trashed']); 
    172172} 
    173173if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {