← Back to branch summary

~canonical-sysadmins/wordpress/4.8

« back to all changes in this revision

Viewing changes to wp-admin/includes/class-wp-ms-sites-list-table.php

  • Committer: Haw Loeung
  • Date: 2016-12-13 06:56:21 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: haw.loeung@canonical.com-20161213065621-8tcu7u7vlxgs2s81
Merge WP4.7 from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-wp-ms-sites-list-table.php
518
518
 
519
519
                $actions['edit']        = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
520
520
                $actions['backend']     = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
521
 
                if ( get_current_site()->blog_id != $blog['blog_id'] ) {
 
521
                if ( get_network()->site_id != $blog['blog_id'] ) {
522
522
                        if ( $blog['deleted'] == '1' ) {
523
523
                                $actions['activate']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
524
524
                        } else {