Changeset 14001

Timestamp:

08/09/2024 01:34:14 PM (2 years ago)

Author:

espellcaste

Message:

Fix: Corrected argument mismatch in printf() function in the Legacy Template pack.

Addressed an issue where the printf() function in the BuddyPress Legacy Template was causing errors in PHP 7.4.33 and PHP 8.0.30 due to an incorrect number of arguments.

Props venutius, mike80222, imath, emaralive.

See #9221 (trunk)
Closes ​https://github.com/buddypress/buddypress/pull/355

File:

• trunk/src/bp-templates/bp-legacy/buddypress/activity/index.php (modified) (16 diffs)

trunk/src/bp-templates/bp-legacy/buddypress/activity/index.php

@@ -26 +26 @@
          * @since 1.2.0
          */
-        do_action( 'bp_before_directory_activity_content' ); ?>
+        do_action( 'bp_before_directory_activity_content' );
+        ?>
 
         <?php if ( is_user_logged_in() ) : ?>
@@ -42 +43 @@
                  * @since 1.0.0
                  */
-                do_action( 'template_notices' ); ?>
+                do_action( 'template_notices' );
+                ?>
 
         </div>
@@ -55 +57 @@
                          * @since 1.2.0
                          */
-                        do_action( 'bp_before_activity_type_tab_all' ); ?>
+                        do_action( 'bp_before_activity_type_tab_all' );
+                        ?>
 
                         <li class="selected" id="activity-all">
@@ -75 +78 @@
                                  * @since 1.2.0
                                  */
-                                do_action( 'bp_before_activity_type_tab_friends' ); ?>
+                                do_action( 'bp_before_activity_type_tab_friends' );
+                                ?>
 
                                 <?php if ( bp_is_active( 'friends' ) ) : ?>
@@ -101 +105 @@
                                  * @since 1.2.0
                                  */
-                                do_action( 'bp_before_activity_type_tab_groups' ); ?>
+                                do_action( 'bp_before_activity_type_tab_groups' );
+                                ?>
 
                                 <?php if ( bp_is_active( 'groups' ) ) : ?>
@@ -127 +132 @@
                                  * @since 1.2.0
                                  */
-                                do_action( 'bp_before_activity_type_tab_favorites' ); ?>
+                                do_action( 'bp_before_activity_type_tab_favorites' );
+                                ?>
 
                                 <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
@@ -151 +157 @@
                                          * @since 1.2.0
                                          */
-                                        do_action( 'bp_before_activity_type_tab_mentions' ); ?>
+                                        do_action( 'bp_before_activity_type_tab_mentions' );
+                                        ?>
 
                                         <li id="activity-mentions">
@@ -161 +168 @@
                                                                         <span>
                                                                                 <?php
-                                                                                /* translators: %s: new mentions count */
-                                                                                printf( esc_html( _nx( '%s new', '%s new', bp_get_total_mention_count_for_user( bp_loggedin_user_id() ), 'Number of new activity mentions', 'buddypress' ), esc_html( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ) );
+                                                                                $new_mentions_count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
+
+                                                                                printf(
+                                                                                        esc_html(
+                                                                                                /* translators: %s: new mentions count */
+                                                                                                _nx(
+                                                                                                        '%s new',
+                                                                                                        '%s new',
+                                                                                                        $new_mentions_count,
+                                                                                                        'Number of new activity mentions',
+                                                                                                        'buddypress'
+                                                                                                )
+                                                                                        ),
+                                                                                        esc_html( $new_mentions_count )
+                                                                                );
                                                                                 ?>
                                                                         </span>
@@ -181 +201 @@
                          * @since 1.2.0
                          */
-                        do_action( 'bp_activity_type_tabs' ); ?>
+                        do_action( 'bp_activity_type_tabs' );
+                        ?>
                 </ul>
         </div><!-- .item-list-tabs -->
@@ -202 +223 @@
                          * @since 1.2.0
                          */
-                        do_action( 'bp_activity_syndication_options' ); ?>
+                        do_action( 'bp_activity_syndication_options' );
+                        ?>
 
                         <li id="activity-filter-select" class="last">
@@ -218 +240 @@
                                          * @since 1.2.0
                                          */
-                                        do_action( 'bp_activity_filter_options' ); ?>
+                                        do_action( 'bp_activity_filter_options' );
+                                        ?>
 
                                 </select>
@@ -232 +255 @@
          * @since 1.5.0
          */
-        do_action( 'bp_before_directory_activity_list' ); ?>
+        do_action( 'bp_before_directory_activity_list' );
+        ?>
 
         <div class="activity" aria-live="polite" aria-atomic="true" aria-relevant="all">
@@ -247 +271 @@
          * @since 1.5.0
          */
-        do_action( 'bp_after_directory_activity_list' ); ?>
+        do_action( 'bp_after_directory_activity_list' );
+        ?>
 
         <?php
@@ -254 +279 @@
          * Fires inside and displays the activity directory display content.
          */
-        do_action( 'bp_directory_activity_content' ); ?>
+        do_action( 'bp_directory_activity_content' );
+        ?>
 
         <?php
@@ -263 +289 @@
          * @since 1.2.0
          */
-        do_action( 'bp_after_directory_activity_content' ); ?>
+        do_action( 'bp_after_directory_activity_content' );
+        ?>
 
         <?php
@@ -272 +299 @@
          * @since 1.5.0
          */
-        do_action( 'bp_after_directory_activity' ); ?>
+        do_action( 'bp_after_directory_activity' );
+        ?>
 
 </div>