Changeset 9095

Timestamp:

10/28/2014 05:12:35 PM (10 years ago)

Author:

boonebgorges

Message:

Rework the building of the recipient list on single messages.

• Deprecate bp_get_the_thread_recipients().
• Move the recipient count logic into the members/single/messages/single.php template.
• Introduce bp_get_thread_recipients_count() and bp_get_thread_recipients_list() to separate the logic of the deprecated function.

Props joshshashaty, Clean-Cole.
Fixes #5327.

Location:

trunk/src

Files:

• bp-messages/bp-messages-template.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/members/single/messages/single.php (modified) (1 diff)

trunk/src/bp-messages/bp-messages-template.php

@@ -1499 +1499 @@
 
 /**
+ * Get a list of thread recipients or a "x recipients" string.
+ *
+ * In BuddyPress 2.2.0, this parts of this functionality were moved into the
+ * members/single/messages/single.php template. This function is no longer used
+ * by BuddyPress.
+ *
+ * @return string
+ */
+function bp_get_the_thread_recipients(){
+    if ( 5 <= bp_get_thread_recipients_count() ) {
+        $recipients = sprintf( __( '%s recipients', 'buddypress' ), number_format_i18n( bp_get_thread_recipients_count() ) );
+    } else {
+        $recipients = bp_get_thread_recipients_list();
+    }
+
+    return apply_filters( 'bp_get_the_thread_recipients', $recipients );
+}
+
+/**
+ * Get the number of recipients in the current thread.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @return int
+ */
+function bp_get_thread_recipients_count() {
+    global $thread_template;
+    return count( $thread_template->thread->recipients );
+}
+
+/**
  * Output HTML links to recipients in the current thread.
- */
-function bp_the_thread_recipients() {
-    echo bp_get_the_thread_recipients();
+ *
+ * @since BuddyPress (2.2.0)
+ */
+function bp_the_thread_recipients_list() {
+    echo bp_get_thread_recipients_list();
 }
     /**
      * Generate HTML links to the profiles of recipients in the current thread.
      *
-     * @return string
-     */
-    function bp_get_the_thread_recipients() {
+     * @since BuddyPress (2.2.0)
+     *
+     * @return string
+     */
+    function bp_get_thread_recipients_list() {
         global $thread_template;
 
         $recipient_links = array();
-
-        if ( count( $thread_template->thread->recipients ) >= 5 ) {
-            return apply_filters( 'bp_get_the_thread_recipients', sprintf( __( '%d Recipients', 'buddypress' ), count( $thread_template->thread->recipients ) ) );
-        }
 
         foreach( (array) $thread_template->thread->recipients as $recipient ) {
@@ -1530 +1561 @@
         }
 
-        return apply_filters( 'bp_get_the_thread_recipients', implode( ', ', $recipient_links ) );
+        return apply_filters( 'bp_get_the_thread_recipients_list', implode( ', ', $recipient_links ) );
     }
 

trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php

@@ -10 +10 @@
             <span class="highlight">
 
-                <?php if ( !bp_get_the_thread_recipients() ) : ?>
+                <?php if ( ! bp_get_thread_recipients_count() ) : ?>
 
                     <?php _e( 'You are alone in this conversation.', 'buddypress' ); ?>
 
+                <?php elseif ( 5 <= bp_get_thread_recipients_count() ) : ?>
+
+                    <?php printf( __( 'Conversation between %s recipients.', 'buddypress' ), number_format_i18n( bp_get_thread_recipients_count() ) ); ?>
+
                 <?php else : ?>
 
-                    <?php printf( __( 'Conversation between %s and you.', 'buddypress' ), bp_get_the_thread_recipients() ); ?>
+                    <?php printf( __( 'Conversation between %s and you.', 'buddypress' ), bp_get_thread_recipients_list() ); ?>
 
                 <?php endif; ?>