Changeset 12380

Timestamp:

04/25/2019 02:39:08 PM (6 years ago)

Author:

boonebgorges

Message:

Nouveau: Improved escaping for activity IDs.

Merges [12378] to the 4.0 branch.

Props whyisjake.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/bp-templates/bp-nouveau/js/buddypress-activity.js (modified) (1 diff)

branches/4.0/src/bp-templates/bp-nouveau/js/buddypress-activity.js

@@ -346 +346 @@
                         // Prepend a link to display all
                         if ( ! i ) {
-                            $( item ).before( '<li class="show-all"><button class="text-button" type="button" data-bp-show-comments-id="#' + activity_item.prop( 'id' ) + '/show-all/"><span class="icon dashicons dashicons-visibility" aria-hidden="true"></span> ' + BP_Nouveau.show_x_comments.replace( '%d', comment_count ) + '</button></li>' );
+                            var activity_id = activity_item.data( 'bpActivityId' );
+                            if ( 'undefined' !== typeof activity_id ) {
+                                activity_id = parseInt( activity_id, 10 );
+                                $( item ).before( '<li class="show-all"><button class="text-button" type="button" data-bp-show-comments-id="#activity-' + activity_id + '/show-all/"><span class="icon dashicons dashicons-visibility" aria-hidden="true"></span> ' + BP_Nouveau.show_x_comments.replace( '%d', comment_count ) + '</button></li>' );
+                            }
                         }
                     }