s/site/user/ if signup doesn't have a domain attached. props wpmuguru, fixes #15780.
git-svn-id: https://develop.svn.wordpress.org/trunk@16954 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
598bb9952a
commit
2a44684f3e
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue