Ticket #4333: 4333.03.diff

bp-members/bp-members-template.php

@@ -764 +764 @@
 
 /** Avatars *******************************************************************/
 
+/**
+ * Output logged in user avatar.
+ *
+ * @since BuddyPress (1.1)
+ *
+ * @param array $args Avatar args {@link bp_core_fetch_avatar()}
+ *               Passing the 'item_id' or 'email' args will have no effect
+ *               as they will be overwritten by bp_loggedin_user_id()
+ *                           and bp_get_loggedin_user_email(), respectively.
+ *
+ * @uses bp_get_loggedin_user_avatar()
+ */
 function bp_loggedin_user_avatar( $args = '' ) {
         echo bp_get_loggedin_user_avatar( $args );
 }
+        /**
+         * Return logged in user avatar.
+         *
+         * @since BuddyPress (1.1)
+         *
+         * @param array $args Avatar args {@link bp_core_fetch_avatar()}
+         *               Passing the 'item_id' or 'email' args will have no effect
+         *               as they will be overwritten by bp_loggedin_user_id()
+         *                           and bp_get_loggedin_user_email(), respectively.
+         *
+         * @global object $bp BuddyPress global settings
+         * @uses bp_loggedin_user_id()
+         * @uses bp_get_loggedin_user_email()
+         * @uses apply_filters() to call 'bp_get_loggedin_user_avatar' hook
+         *
+         * @return string Logged in user avatar
+         */
         function bp_get_loggedin_user_avatar( $args = '' ) {
 
+                // Setup default args
                 $defaults = array(
-                        'type'   => 'thumb',
-                        'width'  => false,
-                        'height' => false,
-                        'html'   => true,
                         'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_loggedin_user_fullname() )
                 );
 
                 $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
 
-                return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+                // Set logged in user args
+                $r['item_id'] = bp_loggedin_user_id();
+                $r['email']   = bp_get_loggedin_user_email();
+
+                return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( $r ) );
         }
 
+/**
+ * Output displayed user avatar.
+ *
+ * @since BuddyPress (1.1)
+ *
+ * @param array $args Avatar args {@link bp_core_fetch_avatar()}
+ *               Passing the 'item_id' or 'email' args will have no effect
+ *               as they will be overwritten by bp_displayed_user_id()
+ *                           and bp_get_displayed_user_email(), respectively.
+ *
+ * @uses bp_get_displayed_user_avatar()
+ */
 function bp_displayed_user_avatar( $args = '' ) {
         echo bp_get_displayed_user_avatar( $args );
 }
+        /**
+         * Return displayed user avatar.
+         *
+         * @since BuddyPress (1.1)
+         *
+         * @param array $args Avatar args {@link bp_core_fetch_avatar()}
+         *               Passing the 'item_id' or 'email' args will have no effect
+         *               as they will be overwritten by bp_displayed_user_id()
+         *                           and bp_get_displayed_user_email(), respectively.
+         *
+         * @global object $bp BuddyPress global settings
+         * @uses bp_displayed_user_id()
+         * @uses bp_get_displayed_user_email()
+         * @uses apply_filters() to call 'bp_get_displayed_user_avatar' hook
+         *
+         * @return string Displayed in user avatar
+         */
         function bp_get_displayed_user_avatar( $args = '' ) {
 
+                // Setup default args
                 $defaults = array(
-                        'type'   => 'thumb',
-                        'width'  => false,
-                        'height' => false,
-                        'html'   => true,
                         'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
                 );
 
                 $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
 
-                return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_displayed_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+                // Set displayed user args
+                $r['item_id'] = bp_displayed_user_id();
+                $r['email']   = bp_get_displayed_user_email();
+
+                return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( $r ) );
         }
 
+/**
+ * Output logged in user email.
+ *
+ * @since BuddyPress (1.6)
+ *
+ * @uses bp_get_loggedin_user_email()
+ */
+function bp_loggedin_user_email() {
+        echo bp_get_loggedin_user_email();
+}
+        /**
+         * Return logged in user email.
+         *
+         * @since BuddyPress (1.6)
+         *
+         * @global object $bp BuddyPress global settings
+         * @uses bp_get_loggedin_user_email()
+         * @uses apply_filters() to call 'bp_get_loggedin_user_email' hook
+         *
+         * @return string Logged in user email
+         */
+        function bp_get_loggedin_user_email() {
+                global $bp;
+
+                // Setup default
+                $retval = '';
+
+                // If displayed user exists, return email address
+                if ( isset( $bp->loggedin_user->userdata->user_email ) )
+                        $retval = $bp->loggedin_user->userdata->user_email;
+
+                return apply_filters( 'bp_get_loggedin_user_email', esc_attr( $retval ) );
+        }
+
+/**
+ * Output displayed in user email.
+ *
+ * @since BuddyPress (1.5)
+ *
+ * @uses bp_get_displayed_user_email
+ */
 function bp_displayed_user_email() {
         echo bp_get_displayed_user_email();
 }
+        /**
+         * Return displayed in user email.
+         *
+         * @since BuddyPress (1.5)
+         *
+         * @global object $bp BuddyPress global settings
+         * @uses bp_get_displayed_user_email()
+         * @uses apply_filters() to call 'bp_get_displayed_user_email' hook
+         *
+         * @return string Displayed user email
+         */
         function bp_get_displayed_user_email() {
                 global $bp;