Changeset 12393 for trunk/src/bp-blogs/bp-blogs-activity.php

Timestamp:

05/03/2019 05:27:08 PM (6 years ago)

Author:

imath

Message:

More constistent escaping in Activity action strings

This commit is also fixing a regression introduced in version 4.3.0 about activity streams secondary avatars.

Fixes #8090 (trunk)

File:

• trunk/src/bp-blogs/bp-blogs-activity.php (modified) (5 diffs)

trunk/src/bp-blogs/bp-blogs-activity.php

@@ -128 +128 @@
     $blog_name = bp_blogs_get_blogmeta( $activity->item_id, 'name' );
 
-    $action = sprintf( __( '%s created the site %s', 'buddypress' ), bp_core_get_userlink( $activity->user_id ), '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
+    $action = sprintf( esc_html__( '%s created the site %s', 'buddypress' ), bp_core_get_userlink( $activity->user_id ), '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
 
     // Legacy filter - requires the BP_Blogs_Blog object.
@@ -210 +210 @@
     if ( empty( $post_title ) ) {
         // Defaults to no title.
-        $post_title = esc_html__( '(no title)', 'buddypress' );
+        $post_title = __( '(no title)', 'buddypress' );
 
         switch_to_blog( $activity->item_id );
@@ -231 +231 @@
 
     // Build the 'post link' part of the activity action string.
-    $post_link  = '<a href="' . esc_url( $post_url ) . '">' . $post_title . '</a>';
+    $post_link  = '<a href="' . esc_url( $post_url ) . '">' . esc_html( $post_title ) . '</a>';
 
     $user_link = bp_core_get_userlink( $activity->user_id );
@@ -237 +237 @@
     // Build the complete activity action string.
     if ( is_multisite() ) {
-        $action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
+        $action  = sprintf( esc_html__( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
     } else {
-        $action  = sprintf( __( '%1$s wrote a new post, %2$s', 'buddypress' ), $user_link, $post_link );
+        $action  = sprintf( esc_html__( '%1$s wrote a new post, %2$s', 'buddypress' ), $user_link, $post_link );
     }
 
@@ -359 +359 @@
     }
 
-    $post_link = '<a href="' . esc_url( $post_url ) . '">' . $post_title . '</a>';
+    $post_link = '<a href="' . esc_url( $post_url ) . '">' . esc_html( $post_title ) . '</a>';
     $user_link = bp_core_get_userlink( $activity->user_id );
 
     if ( is_multisite() ) {
-        $action  = sprintf( __( '%1$s commented on the post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
+        $action  = sprintf( esc_html__( '%1$s commented on the post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
     } else {
-        $action  = sprintf( __( '%1$s commented on the post, %2$s', 'buddypress' ), $user_link, $post_link );
+        $action  = sprintf( esc_html__( '%1$s commented on the post, %2$s', 'buddypress' ), $user_link, $post_link );
     }