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

Timestamp:

03/27/2023 06:19:06 PM (3 years ago)

Author:

imath

Message:

Improve Components Member's single item navigation generation

• Edit the BP_Component Class so that it globalize navigation items before registering it.
• Introduce bp_get_component_navigations(), a new function that will be used to get Member's single navigation customizable slugs within the BuddyPress settings area.
• Perform all remaining bp_loggedin_user_domain() replacements (55) in favor of the bp_loggedin_user_url() function which uses BP Rewrites to build URLs.
• Improve bp_loggedin_user_link() by adding a new $chunks array of arguments to output escaped URL in templates.
• Adapt some PHPUnit testcases.

Props r-a-y, johnjamesjacoby, boonebgorges

Closes ​https://github.com/buddypress/buddypress/pull/78
See #4954

File:

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

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

@@ -7 +7 @@
  * @package BuddyPress
  * @subpackage bp-legacy
- * @version 3.0.0
+ * @version 12.0.0
  */
 
@@ -82 +82 @@
 
                                                 <li id="activity-friends">
-                                                        <a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/'; ?>">
+                                                        <a href="<?php bp_loggedin_user_link( array( bp_get_activity_slug(), bp_get_friends_slug() ) ); ?>">
                                                                 <?php
                                                                 /* translators: %s: number of friends */
-                                                                printf( __( 'My Friends %s', 'buddypress' ), '<span>' . bp_get_total_friend_count( bp_loggedin_user_id() ) . '</span>' );
+                                                                printf( esc_html__( 'My Friends %s', 'buddypress' ), '<span>' . bp_get_total_friend_count( bp_loggedin_user_id() ) . '</span>' );
                                                                 ?>
                                                         </a>
@@ -107 +107 @@
                                         <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                                                <?php
-                                                printf(
-                                                        '<li id="activity-groups"><a href="%1$s">%2$s</a></li>',
-                                                        esc_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ),
-                                                        sprintf(
+                                                <li id="activity-groups">
+                                                        <a href="<?php bp_loggedin_user_link( array( bp_get_activity_slug(), bp_get_groups_slug() ) ); ?>">
+                                                                <?php
                                                                 /* translators: %s: current user groups count */
-                                                                __( 'My Groups %s', 'buddypress' ),
-                                                                '<span>' . bp_get_total_group_count_for_user( bp_loggedin_user_id() ) . '</span>'
-                                                        )
-                                                );
-                                                ?>
+                                                                printf( esc_html__( 'My Groups %s', 'buddypress' ), '<span>' . bp_get_total_group_count_for_user( bp_loggedin_user_id() ) . '</span>' );
+                                                                ?>
+                                                        </a>
+                                                </li>
 
                                         <?php endif; ?>
@@ -135 +132 @@
 
                                         <li id="activity-favorites">
-                                                <a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/'; ?>">
+                                                <a href="<?php bp_loggedin_user_link( array( bp_get_activity_slug(), 'favorites' ) ); ?>">
                                                         <?php
                                                         /* translators: %s: number of favorites */
-                                                        printf( __( 'My Favorites %s', 'buddypress' ), '<span>' . bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) . '</span>' );
+                                                        printf( esc_html__( 'My Favorites %s', 'buddypress' ), '<span>' . bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) . '</span>' );
                                                         ?>
                                                 </a>
@@ -157 +154 @@
 
                                         <li id="activity-mentions">
-                                                <a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/'; ?>">
-                                                        <?php _e( 'Mentions', 'buddypress' ); ?>
+                                                <a href="<?php bp_loggedin_user_link( array( bp_get_activity_slug(), 'mentions' ) ); ?>">
+                                                        <?php esc_html_e( 'Mentions', 'buddypress' ); ?>
                                                         <?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?>
                                                                 &nbsp;
@@ -165 +162 @@
                                                                                 <?php
                                                                                 /* translators: %s: new mentions count */
-                                                                                printf( _nx( '%s new', '%s new', bp_get_total_mention_count_for_user( bp_loggedin_user_id() ), 'Number of new activity mentions', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) );
+                                                                                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' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) );
                                                                                 ?>
                                                                         </span>