Changeset 13631

Timestamp:

11/03/2023 04:37:33 AM (15 months ago)

Author:

imath

Message:

Add a function to output the bp-activity-comment-id data attribute

In BP Nouveau, instead of using the same function to output the bp-activity-comment-id or bp-activity-id data attribute according to the activity type, introduce the bp_nouveau_activity_comment_data_attribute_id() function and use it inside the activity/comment.php template.
This prevents a notice warning notice and avoid to query for the parent activity to get the right activity type.

Props vapvarun

Fixes #9014
Closes ​https://github.com/buddypress/buddypress/pull/182

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/activity/comment.php (modified) (1 diff)
• includes/activity/template-tags.php (modified) (3 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment.php

@@ -7 +7 @@
  *
  * @since 3.0.0
- * @version 10.0.0
+ * @version 12.0.0
  */
 
 bp_nouveau_activity_hook( 'before', 'comment' ); ?>
 
-<li id="acomment-<?php bp_activity_comment_id(); ?>" class="comment-item" <?php bp_nouveau_activity_data_attribute_id(); ?>>
+<li id="acomment-<?php bp_activity_comment_id(); ?>" class="comment-item" <?php bp_nouveau_activity_comment_data_attribute_id(); ?>>
     <div class="acomment-avatar item-avatar">
         <a href="<?php bp_activity_comment_user_link(); ?>">

trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -160 +160 @@
 
 /**
- * Output the `data-bp-activity-id` or `data-bp-activity-comment-id` attribute
- * according to the activity type.
+ * Output the `data-bp-activity-id` attribute.
  *
  * @since 10.0.0
  */
 function bp_nouveau_activity_data_attribute_id() {
-    $attribute  = 'data-bp-%1$s-id="%2$s"';
-    $type       = 'activity';
-    $id         = (int) bp_get_activity_id();
-    $comment_id = (int) bp_get_activity_comment_id();
-
-    if ( 'activity_comment' === bp_get_activity_type() || $comment_id ) {
-        $type = 'activity-comment';
-
-
-        if ( $comment_id ) {
-            $id = $comment_id;
-        }
-    }
-
-    printf( $attribute, $type, $id );
+    printf( 'data-bp-activity-id="%d"', (int) bp_get_activity_id() );
+}
+
+/**
+ * Output the `data-bp-activity-comment-id` attribute.
+ *
+ * @since 12.0.0
+ */
+function bp_nouveau_activity_comment_data_attribute_id() {
+    printf( 'data-bp-activity-comment-id="%d"', (int) bp_get_activity_comment_id() );
 }
 
@@ -277 +271 @@
      * @todo This function is too large and needs refactoring and reviewing.
      * @since 3.0.0
-     * 
+     *
      * @global BP_Activity_Template $activities_template The Activity template loop.
      *
@@ -778 +772 @@
      *
      * @since 3.0.0
-     * 
+     *
      * @global BP_Activity_Template $activities_template The Activity template loop.
      *