From 8ab77e04e7ea1676157ec56c976f743a78779585 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Thu, 7 Jan 2010 00:24:03 +0000 Subject: [PATCH] Change references to wpmu-edit.php - See #11644 git-svn-id: http://svn.automattic.com/wordpress/trunk@12620 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 2 +- wp-admin/ms-edit.php | 2 +- wp-admin/ms-options.php | 2 +- wp-admin/ms-sites.php | 20 ++++++++++---------- wp-admin/ms-users.php | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index c3837c531..84bacf86f 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -143,7 +143,7 @@ function confirm_delete_users( $users ) { echo '

' . __( 'Transfer posts before deleting users:' ) . '

'; - echo '
'; + echo ''; echo ''; wp_nonce_field( 'allusers' ); foreach ( (array) $_POST['allusers'] as $key => $val ) { diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index 53cbff628..08babdd8d 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -425,7 +425,7 @@ switch( $_GET['action'] ) {

WordPress

- ' method='post'> + ' method='post'> ' /> diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index b5f141ce6..2aa1f48ee 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -21,7 +21,7 @@ if (isset($_GET['updated'])) {

- +

(These settings cannot be modified by blog owners)') ?>

diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php index 328b92db8..4607ceaee 100644 --- a/wp-admin/ms-sites.php +++ b/wp-admin/ms-sites.php @@ -79,7 +79,7 @@ switch( $_GET['action'] ) { ?>

- '>http://

- +
@@ -377,7 +377,7 @@ switch( $_GET['action'] ) { -
+
$blog_navigation
"; ?> @@ -478,21 +478,21 @@ switch( $_GET['action'] ) { $controlActions[] = "" . __('Backend') . ''; if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' ) - $controlActions[] = '' . __('Activate') . ''; + $controlActions[] = '' . __('Activate') . ''; else - $controlActions[] = '' . __('Deactivate') . ''; + $controlActions[] = '' . __('Deactivate') . ''; if( get_blog_status( $blog['blog_id'], "archived" ) == '1' ) - $controlActions[] = '' . __('Unarchive') . ''; + $controlActions[] = '' . __('Unarchive') . ''; else - $controlActions[] = '' . __('Archive') . ''; + $controlActions[] = '' . __('Archive') . ''; if( get_blog_status( $blog['blog_id'], "spam" ) == '1' ) - $controlActions[] = '' . __('Not Spam') . ''; + $controlActions[] = '' . __('Not Spam') . ''; else - $controlActions[] = '' . __("Spam") . ''; + $controlActions[] = '' . __("Spam") . ''; - $controlActions[] = '' . __("Delete") . ''; + $controlActions[] = '' . __("Delete") . ''; $controlActions[] = "" . __('Visit') . ''; ?> @@ -578,7 +578,7 @@ switch( $_GET['action'] ) {

- +
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php index 2d1f856ef..25976eab4 100644 --- a/wp-admin/ms-users.php +++ b/wp-admin/ms-users.php @@ -111,7 +111,7 @@ if ( $_GET['updated'] == 'true' ) { - +
$user_navigation
"; ?> @@ -183,8 +183,8 @@ if ( $_GET['updated'] == 'true' ) { case 'login': $avatar = get_avatar( $user['user_email'], 32 ); $edit = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=".$user['ID'] ) ); - // @todo Make delete link work like delete button with transfering users (in wpmu-edit.php) - //$delete = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), wp_nonce_url( 'wpmu-edit.php', 'deleteuser' ) . '&action=deleteuser&id=' . $user['ID'] ) ); + // @todo Make delete link work like delete button with transfering users (in ms-edit.php) + //$delete = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&action=deleteuser&id=' . $user['ID'] ) ); ?>
@@ -280,7 +280,7 @@ if( apply_filters('show_adduser_fields', true) ) : ?>

- +