Changes from trunk/wp-admin/users.php at r17977 to branches/3.1/wp-admin/users.php at r17440

File:

• branches/3.1/wp-admin/users.php (modified) (7 diffs)

branches/3.1/wp-admin/users.php

@@ -26 +26 @@
     '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>' .
     '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="http://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
+    '<p>' . __('<a href="http://codex.wordpress.org/Users_Users_SubPanel" target="_blank">Documentation on Managing Users</a>') . '</p>' .
     '<p>' . __('<a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
     '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
@@ -151 +151 @@
                 $userids = array(intval($_REQUEST['user']));
         else
-                $userids = (array) $_REQUEST['users'];
+                $userids = $_REQUEST['users'];
 
         include ('admin-header.php');
@@ -162 +162 @@
 <?php screen_icon(); ?>
 <h2><?php _e('Delete Users'); ?></h2>
-<p><?php echo _n( 'You have specified this user for deletion:', 'You have specified these users for deletion:', count( $userids ) ); ?></p>
+<p><?php _e('You have specified these users for deletion:'); ?></p>
 <ul>
 <?php
-        $go_delete = 0;
-        foreach ( $userids as $id ) {
+        $go_delete = false;
+        foreach ( (array) $userids as $id ) {
                 $id = (int) $id;
                 $user = new WP_User($id);
@@ -173 +173 @@
                 } else {
                         echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
-                        $go_delete++;
+                        $go_delete = true;
                 }
         }
@@ -179 +179 @@
         </ul>
 <?php if ( $go_delete ) : ?>
-        <fieldset><p><legend><?php echo _n( 'What should be done with posts and links owned by this user?', 'What should be done with posts and links owned by these users?', $go_delete ); ?></legend></p>
+        <fieldset><p><legend><?php _e('What should be done with posts and links owned by this user?'); ?></legend></p>
         <ul style="list-style:none;">
                 <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
@@ -361 +361 @@
 echo esc_html( $title );
 if ( current_user_can( 'create_users' ) ) { ?>
-        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
+        <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+        <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 <?php }
 
@@ -379 +379 @@
 </form>
 
+<?php
+if ( is_multisite() ) {
+        foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
+                $var = 'new_' . $var;
+                $$var = isset($_REQUEST[$formpost]) ? esc_attr(stripslashes($_REQUEST[$formpost])) : '';
+        }
+        unset($name);
+}
+?>
+
 <br class="clear" />
 </div>