WordPress.org

Make WordPress Core

Ticket #15780: 15780.diff

File 15780.diff, 993 bytes (added by wpmuguru, 3 years ago)
  • wp-includes/ms-functions.php

     
    770770 
    771771        $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) ); 
    772772 
    773         if ( empty($signup) ) 
    774                 return new WP_Error('invalid_key', __('Invalid activation key.')); 
     773        if ( empty( $signup ) ) 
     774                return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) ); 
    775775 
    776         if ( $signup->active ) 
    777                 return new WP_Error('already_active', __('The site is already active.'), $signup); 
     776        if ( $signup->active ) { 
     777                if ( empty( $signup->domain ) ) 
     778                        return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup ); 
     779                else 
     780                        return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup ); 
     781        } 
    778782 
    779783        $meta = unserialize($signup->meta); 
    780784        $user_login = $wpdb->escape($signup->user_login);