Index: wp-admin/includes/class-wp-ms-sites-list-table.php
===================================================================
--- wp-admin/includes/class-wp-ms-sites-list-table.php (revision 16392)
+++ wp-admin/includes/class-wp-ms-sites-list-table.php (working copy)
@@ -164,6 +164,7 @@
$status_list = array(
'archived' => array( 'site-archived', __( 'Archived' ) ),
'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
+ 'deactivated' => array( 'site-deactivated', __( 'Deactivated' ) ),
'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
'mature' => array( 'site-mature', __( 'Mature' ) )
);
@@ -194,7 +195,7 @@
echo "
";
$blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
-
+
list( $columns, $hidden ) = $this->get_column_info();
foreach ( $columns as $column_name => $column_display_name ) {
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php (revision 16392)
+++ wp-admin/includes/upgrade.php (working copy)
@@ -1907,6 +1907,7 @@
mature tinyint(2) NOT NULL default '0',
spam tinyint(2) NOT NULL default '0',
deleted tinyint(2) NOT NULL default '0',
+ deactivated tinyint(2) NOT NULL default '0',
lang_id int(11) NOT NULL default '0',
PRIMARY KEY (blog_id),
KEY domain (domain(50),path(5)),
Index: wp-admin/network/edit.php
===================================================================
--- wp-admin/network/edit.php (revision 16392)
+++ wp-admin/network/edit.php (working copy)
@@ -178,7 +178,7 @@
} else {
wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'not_deleted' ), wp_get_referer() ) );
}
-
+
exit();
break;
@@ -252,7 +252,7 @@
if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'You do not have permission to access this page.' ) );
- update_blog_status( $id, 'deleted', '0' );
+ update_blog_status( $id, 'deactivated', '0' );
do_action( 'activate_blog', $id );
wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'activate' ), wp_get_referer() ) );
exit();
@@ -264,7 +264,7 @@
wp_die( __( 'You do not have permission to access this page.' ) );
do_action( 'deactivate_blog', $id );
- update_blog_status( $id, 'deleted', '1' );
+ update_blog_status( $id, 'deactivated', '1' );
wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'deactivate' ), wp_get_referer() ) );
exit();
break;