WordPress.org

Make WordPress Core

Ticket #14585: 14585.3.diff

File 14585.3.diff, 2.5 KB (added by markmcwilliams, 4 years ago)

matches latest trunk files

  • wp-admin/includes/default-list-tables.php

     
    29012901                                                        ); 
    29022902 
    29032903                                                        $actions['edit']        = '<span class="edit"><a href="' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a></span>'; 
    2904                                                         $actions['backend']     = "<span class='backend'><a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>'; 
     2904                                                        $actions['backend']     = "<span class='backend'><a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a></span>'; 
    29052905                                                        if ( $current_site->blog_id != $blog['blog_id'] ) { 
    29062906                                                                if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' ) 
    29072907                                                                        $actions['activate']    = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>'; 
  • wp-admin/network/sites.php

     
    3333                '<p>' . __('Add New takes you farther down on this same page. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' . 
    3434                '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' . 
    3535                '<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' . 
    36                 '<ul><li>' . __('an Edit link to a separate Edit Site screen.') . '</li>' . 
    37                 '<li>' . __('Backend means the Dashboard for that site.') . '</li>' . 
     36                '<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' . 
     37                '<li>' . __('Dashboard means the Dashboard for that site.') . '</li>' . 
    3838                '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' . 
    3939                '<li>' . __('Delete which is a permanent action after the confirmations screen.') . '</li>' . 
    4040                '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .