Ticket #46895: 46895.diff

src/wp-admin/includes/privacy-tools.php

@@ -234 +234 @@
  * @return string The HTML for this group and its items.
  */
 function wp_privacy_generate_personal_data_export_group_html( $group_data ) {
-        $group_html = '<h2>' . esc_html( $group_data['group_label'] ) . '</h2>';
+
+        $group_html  = '<h2>';
+        $group_html .= esc_html( $group_data['group_label'] );
+
+        if ( $group_data['group_display_count'] ) {
+                $items_count = count( (array) $group_data['items'] );
+                $group_html .= sprintf( ' <span class="count">(%d)</span>', $items_count );
+        }
+
+        $group_html .= '</h2>';
 
         if ( ! empty( $group_data['group_description'] ) ) {
                 $group_html .= '<p>' . esc_html( $group_data['group_description'] ) . '</p>';
@@ -621 +630 @@
                 $group_id    = $export_datum['group_id'];
                 $group_label = $export_datum['group_label'];
 
+                $group_display_count = false;
+                if ( isset( $export_datum['group_display_count'] ) ) {
+                        $group_display_count = (bool) $export_datum['group_display_count'];
+                }
+
                 $group_description = '';
                 if ( ! empty( $export_datum['group_description'] ) ) {
                         $group_description = $export_datum['group_description'];
@@ -628 +642 @@
 
                 if ( ! array_key_exists( $group_id, $groups ) ) {
                         $groups[ $group_id ] = array(
-                                'group_label'       => $group_label,
-                                'group_description' => $group_description,
-                                'items'             => array(),
+                                'group_label'         => $group_label,
+                                'group_display_count' => $group_display_count,
+                                'group_description'   => $group_description,
+                                'items'               => array(),
                         );
                 }
 

src/wp-includes/comment.php

@@ -3434 +3434 @@
                 }
 
                 $data_to_export[] = array(
-                        'group_id'          => 'comments',
-                        'group_label'       => __( 'Comments' ),
-                        'group_description' => __( 'User’s comment data.' ),
-                        'item_id'           => "comment-{$comment->comment_ID}",
-                        'data'              => $comment_data_to_export,
+                        'group_id'            => 'comments',
+                        'group_label'         => __( 'Comments' ),
+                        'group_display_count' => true,
+                        'group_description'   => __( 'User’s comment data.' ),
+                        'item_id'             => "comment-{$comment->comment_ID}",
+                        'data'                => $comment_data_to_export,
                 );
         }
 

src/wp-includes/media.php

@@ -4307 +4307 @@
                         );
 
                         $data_to_export[] = array(
-                                'group_id'          => 'media',
-                                'group_label'       => __( 'Media' ),
-                                'group_description' => __( 'User’s media data.' ),
-                                'item_id'           => "post-{$post->ID}",
-                                'data'              => $post_data_to_export,
+                                'group_id'            => 'media',
+                                'group_label'         => __( 'Media' ),
+                                'group_display_count' => true,
+                                'group_description'   => __( 'User’s media data.' ),
+                                'item_id'             => "post-{$post->ID}",
+                                'data'                => $post_data_to_export,
                         );
                 }
         }