Changeset 26368
- Timestamp:
- 11/25/2013 02:04:18 AM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/my-sites.php
r26284 r26368 40 40 'title' => __('Overview'), 41 41 'content' => 42 '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or shecan use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .42 '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' . 43 43 '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>' 44 44 ) ); -
trunk/src/wp-admin/network/users.php
r25994 r26368 234 234 'content' => 235 235 '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' . 236 '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .236 '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' . 237 237 '<p>' . __('You can also go to the user’s profile page by clicking on the individual username.') . '</p>' . 238 238 '<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' . -
trunk/src/wp-admin/user-edit.php
r26253 r26368 121 121 $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) ); 122 122 123 // W PMU must delete the user from the current blog if WP added him after editing.123 // We must delete the user from the current blog if WP added them after editing. 124 124 $delete_role = false; 125 125 $blog_prefix = $wpdb->get_blog_prefix(); -
trunk/src/wp-includes/ms-functions.php
r26252 r26368 52 52 * Get one of a user's active blogs 53 53 * 54 * Returns the user's primary blog, if she hasone and54 * Returns the user's primary blog, if they have one and 55 55 * it is active. If it's inactive, function returns another 56 56 * active blog of the user. If none are found, the user … … 1188 1188 1189 1189 /** 1190 * Notify a user that her blog activation has been successful.1190 * Notify a user that their blog activation has been successful. 1191 1191 * 1192 1192 * Filter 'wpmu_welcome_notification' to disable or bypass. … … 1254 1254 1255 1255 /** 1256 * Notify a user that her account activation has been successful.1256 * Notify a user that their account activation has been successful. 1257 1257 * 1258 1258 * Filter 'wpmu_welcome_user_notification' to disable or bypass.
Note: See TracChangeset
for help on using the changeset viewer.