Changeset 23535
- Timestamp:
- 02/28/2013 08:28:36 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/ms-functions.php
r23511 r23535 812 812 * @uses wpmu_welcome_user_notification() 813 813 * @uses add_user_to_blog() 814 * @uses add_new_user_to_blog()815 814 * @uses wpmu_create_user() 816 815 * @uses wpmu_create_blog() … … 858 857 return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup); 859 858 860 wpmu_welcome_user_notification($user_id, $password, $meta); 861 862 add_new_user_to_blog( $user_id, $user_email, $meta ); 863 do_action('wpmu_activate_user', $user_id, $password, $meta); 864 return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta); 859 wpmu_welcome_user_notification( $user_id, $password, $meta ); 860 do_action( 'wpmu_activate_user', $user_id, $password, $meta ); 861 return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta ); 865 862 } 866 863 … … 1678 1675 * Add a newly created user to the appropriate blog 1679 1676 * 1680 * @since MU 1677 * To add a user in general, use add_user_to_blog(). This function 1678 * is specifically hooked into the wpmu_activate_user action. 1679 * 1680 * @since MU 1681 * @see add_user_to_blog() 1681 1682 * 1682 1683 * @param int $user_id 1683 * @param string $email1684 * @param mixed $password Ignored. 1684 1685 * @param array $meta 1685 1686 */ 1686 function add_new_user_to_blog( $user_id, $ email, $meta ) {1687 function add_new_user_to_blog( $user_id, $password, $meta ) { 1687 1688 global $current_site; 1688 1689 if ( !empty( $meta[ 'add_to_blog' ] ) ) {
Note: See TracChangeset
for help on using the changeset viewer.