Changeset 16954

Timestamp:

12/15/2010 05:09:26 PM (14 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -771 +771 @@
     $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
-    if ( empty($signup) )
-        return new WP_Error('invalid_key', __('Invalid activation key.'));
-
-    if ( $signup->active )
-        return new WP_Error('already_active', __('The site is already active.'), $signup);
+    if ( empty( $signup ) )
+        return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+
+    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 );
+    }
 
     $meta = unserialize($signup->meta);