Changeset 2842 for trunk/bp-core/bp-core-templatetags.php

Timestamp:

03/12/2010 01:03:42 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

• trunk/bp-core/bp-core-templatetags.php (modified) (4 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -310 +310 @@
 
                 // Populate the user if it hasn't been already.
-                if ( empty( $members_template->member->profile_data ) )
-                        $members_template->member = new BP_Core_User( $members_template->member->id );
+                if ( empty( $members_template->member->profile_data ) && method_exists( 'BP_XProfile_ProfileData', 'get_all_for_user' ) )
+                        $members_template->member->profile_data = BP_XProfile_ProfileData::get_all_for_user( $members_template->member->id );
 
                 $data = xprofile_format_profile_field( $members_template->member->profile_data[$field]['field_type'], $members_template->member->profile_data[$field]['field_data'] );
@@ -917 +917 @@
         } else if ( bp_is_activation_page() ) {
                 $title = __( 'Activate your Account', 'buddypress' );
+
+        } else if ( bp_is_group_create() ) {
+                $title = __( 'Create a Group', 'buddypress' );
+
+        } else if ( bp_is_create_blog() ) {
+                $title = __( 'Create a Blog', 'buddypress' );
         }
 
@@ -1184 +1190 @@
                 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 +1247 @@
 
 function bp_registration_needs_activation() {
-        return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
+        return apply_filters( 'bp_registration_needs_activation', true );
 }