Changeset 10197

Timestamp:

10/07/2015 02:12:26 PM (9 years ago)

Author:

djpaul

Message:

Admin, Activity: fix missing comment count bubble on Activity admin screen.

Caused by a change in WordPress 4.3.

Fixes #6609 for trunk, props r-a-y and imath

Location:

trunk/src/bp-activity

Files:

• admin/css/admin-rtl.css (modified) (1 diff)
• admin/css/admin.css (modified) (1 diff)
• bp-activity-admin.php (modified) (4 diffs)

trunk/src/bp-activity/admin/css/admin-rtl.css

@@ -45 +45 @@
 #bp-activities-form .column-response img {
     float: right;
+    margin-bottom: 5px;
     margin-left: 10px;
     margin-top: 1px;

trunk/src/bp-activity/admin/css/admin.css

@@ -45 +45 @@
 #bp-activities-form .column-response img {
     float: left;
+    margin-bottom: 5px;
     margin-right: 10px;
     margin-top: 1px;

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

@@ -1643 +1643 @@
     function column_response( $item ) {
         // Is $item is a root activity?
+        ?>
+
+        <div class="response-links">
+
+        <?php
+        // Activity permalink
+        $activity_permalink = '';
+        if ( ! $item['is_spam'] ) {
+            $activity_permalink = sprintf( __( '<a href="%1$s" class="comments-view-item-link">View Activity</a>', 'buddypress' ), bp_activity_get_permalink( $item['id'], (object) $item ) );
+        }
 
         /**
@@ -1653 +1663 @@
          */
         if ( empty( $item['item_id'] ) || ! in_array( $item['type'], apply_filters( 'bp_activity_admin_root_activity_types', array( 'activity_comment' ), $item ) ) ) {
+            echo $activity_permalink;
+
             $comment_count     = !empty( $item['children'] ) ? bp_activity_recurse_comment_count( (object) $item ) : 0;
             $root_activity_url = bp_get_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
@@ -1659 +1671 @@
             if ( $comment_count ) {
                 $title_attr = sprintf( _n( '%s related activity', '%s related activities', $comment_count, 'buddypress' ), number_format_i18n( $comment_count ) );
-                printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', esc_url( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
+                printf( '<a href="%1$s" title="%2$s" class="post-com-count post-com-count-approved"><span class="comment-count comment-count-approved">%3$s</span></a>', esc_url( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
             }
 
@@ -1665 +1677 @@
         } else {
             echo '<strong>' . get_avatar( $this->get_activity_user_id( $item['item_id'] ), '32' ) . ' ' . bp_core_get_userlink( $this->get_activity_user_id( $item['item_id'] ) ) . '</strong><br />';
-        }
-
-        // Activity permalink
-        if ( ! $item['is_spam'] )
-            printf( __( '<a href="%1$s">View Activity</a>', 'buddypress' ), bp_activity_get_permalink( $item['id'], (object) $item ) );
+            echo $activity_permalink;
+        }
+        ?>
+
+        </div>
+
+        <?php
     }