Changeset 12669

Timestamp:

06/16/2020 05:24:41 AM (4 years ago)

Author:

imath

Message:

BP Nouveau: make sure to format the total objects count once only

This is a follow up of [12619] & [12634] to apply the fix to the "my blogs", "my notifications", "my groups" and "my friends" count.

props etatus

See #8311 (Branch 6.0)

Location:

branches/6.0/src

Files:

• bp-blogs/classes/class-bp-blogs-component.php (modified) (1 diff)
• bp-friends/bp-friends-filters.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (1 diff)
• bp-friends/classes/class-bp-friends-component.php (modified) (1 diff)
• bp-notifications/bp-notifications-filters.php (modified) (2 diffs)
• bp-notifications/classes/class-bp-notifications-component.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/blogs/loader.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/friends/loader.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/groups/loader.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/notifications/loader.php (modified) (2 diffs)

branches/6.0/src/bp-blogs/classes/class-bp-blogs-component.php

@@ -225 +225 @@
                 '<span class="%s">%s</span>',
                 esc_attr( $class ),
-                bp_core_number_format( $count )
+                esc_html( $count )
             )
         );

branches/6.0/src/bp-friends/bp-friends-filters.php

@@ -10 +10 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
+
+// Format numerical output.
+add_filter( 'friends_get_total_friend_count', 'bp_core_number_format' );
+add_filter( 'bp_get_total_friend_count',      'bp_core_number_format' );
 
 /**

branches/6.0/src/bp-friends/bp-friends-template.php

@@ -650 +650 @@
         return apply_filters( 'bp_get_total_friend_count', friends_get_total_friend_count( $user_id ), $user_id );
     }
-    add_filter( 'bp_get_total_friend_count', 'bp_core_number_format' );
 
 /**

branches/6.0/src/bp-friends/classes/class-bp-friends-component.php

@@ -177 +177 @@
                 '<span class="%s">%s</span>',
                 esc_attr( $class ),
-                bp_core_number_format( $count )
+                esc_html( $count )
             )
         );

branches/6.0/src/bp-notifications/bp-notifications-filters.php

@@ -1 +1 @@
 <?php
 /**
- * Filters related to the Activity component.
+ * Filters related to the Notifications component.
  *
  * @package BuddyPress
@@ -7 +7 @@
  * @since 4.0.0
  */
+
+
+// Format numerical output.
+add_filter( 'bp_notifications_get_total_notification_count', 'bp_core_number_format' );
 
 // Privacy data export.

branches/6.0/src/bp-notifications/classes/class-bp-notifications-component.php

@@ -165 +165 @@
                     '<span class="%s">%s</span>',
                     esc_attr( $class ),
-                    bp_core_number_format( $count )
+                    esc_html( $count )
                 )
             );

branches/6.0/src/bp-templates/bp-nouveau/includes/blogs/loader.php

@@ -4 +4 @@
  *
  * @since 3.0.0
+ * @version 6.1.0
  */
 
@@ -89 +90 @@
             // Add controls into the Blogs sections of the customizer.
             add_filter( 'bp_nouveau_customizer_controls', 'bp_nouveau_blogs_customizer_controls', 11, 1 );
+
+            // The number formatting is done into the `bp_nouveau_nav_count()` template tag.
+            remove_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
         }
     }

branches/6.0/src/bp-templates/bp-nouveau/includes/friends/loader.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 6.1.0
  */
 
@@ -88 +88 @@
             add_filter( 'bp_button_' . $button, 'bp_nouveau_ajax_button', 10, 5 );
         }
+
+        // The number formatting is done into the `bp_nouveau_nav_count()` template tag.
+        remove_filter( 'friends_get_total_friend_count', 'bp_core_number_format' );
+        remove_filter( 'bp_get_total_friend_count',      'bp_core_number_format' );
     }
 

branches/6.0/src/bp-templates/bp-nouveau/includes/groups/loader.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 6.0.0
+ * @version 6.1.0
  */
 
@@ -134 +134 @@
         // The number formatting is done into the `bp_nouveau_nav_count()` template tag.
         remove_filter( 'bp_get_total_group_count', 'bp_core_number_format' );
+        remove_filter( 'bp_get_total_group_count_for_user', 'bp_core_number_format' );
     }
 

branches/6.0/src/bp-templates/bp-nouveau/includes/notifications/loader.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 6.1.0
  */
 
@@ -88 +88 @@
         add_filter( 'bp_get_the_notification_mark_read_link', 'bp_nouveau_notifications_mark_read_link', 10, 1 );
         add_filter( 'bp_get_the_notification_delete_link', 'bp_nouveau_notifications_delete_link', 10, 1 );
+
+        // The number formatting is done into the `bp_nouveau_nav_count()` template tag.
+        remove_filter( 'bp_notifications_get_total_notification_count', 'bp_core_number_format' );
     }
 }