Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-26 10:11:29 +01:00
Code Issues Projects Releases Wiki Activity

s/site/user/ if signup doesn't have a domain attached. props wpmuguru, fixes #15780.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-15 17:09:26 +00:00
parent 899f0e115d
commit 1b18b8e5f0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/ms-functions.php
View File

@ -773,8 +773,12 @@ function wpmu_activate_signup($key) {
if ( empty( $signup ) ) if ( empty( $signup ) )
return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) ); return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
if ( $signup->active ) if ( $signup->active ) {
if ( empty( $signup->domain ) )
return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
else
return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup ); return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
}
$meta = unserialize($signup->meta); $meta = unserialize($signup->meta);
$user_login = $wpdb->escape($signup->user_login); $user_login = $wpdb->escape($signup->user_login);