Changeset 2832 for branches/1.2/bp-core/bp-core-templatetags.php

Timestamp:

03/11/2010 04:52:34 PM (15 years ago)

Author:

apeatling

Message:

Fixes #2149, fixed inconsistencies between single WP and WPMU with registration and activation. Single WP users must now activate their accounts and confirm they are using a valid email.

File:

• branches/1.2/bp-core/bp-core-templatetags.php (modified) (2 diffs)

branches/1.2/bp-core/bp-core-templatetags.php

@@ -1184 +1184 @@
         extract( $r, EXTR_SKIP );
 
-        if ( !bp_core_is_multisite() && !empty( $_POST['signup_username'] ) ) {
-            $user_id = bp_core_get_userid( $_POST['signup_username'] );
-            return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
+        $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
+
+        if ( empty( $signup_avatar_dir ) ) {
+            if ( empty( $bp->grav_default->user ) ) {
+                $default_grav = 'wavatar';
+            } else if ( 'mystery' == $bp->grav_default->user ) {
+                $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
+            } else {
+                $default_grav = $bp->grav_default->user;
+            }
+
+            $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
+            return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
         } else {
-            $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
-
-            if ( empty( $signup_avatar_dir ) ) {
-                if ( empty( $bp->grav_default->user ) ) {
-                    $default_grav = 'wavatar';
-                } else if ( 'mystery' == $bp->grav_default->user ) {
-                    $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
-                } else {
-                    $default_grav = $bp->grav_default->user;
-                }
-
-                $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
-                return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
-            } else {
-                return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
-            }
+            return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
         }
     }
@@ -1246 +1241 @@
 
 function bp_registration_needs_activation() {
-    return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
+    return apply_filters( 'bp_registration_needs_activation', true );
 }