WordPress.org

Make WordPress Core

Changeset 16954


Ignore:
Timestamp:
12/15/10 17:09:26 (3 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-functions.php

    r16949 r16954  
    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.')); 
    775  
    776     if ( $signup->active ) 
    777         return new WP_Error('already_active', __('The site is already active.'), $signup); 
     773    if ( empty( $signup ) ) 
     774        return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) ); 
     775 
     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); 
Note: See TracChangeset for help on using the changeset viewer.