diff --git a/collectors/assets.php b/collectors/assets.php index 72ccded8f..000eee646 100644 --- a/collectors/assets.php +++ b/collectors/assets.php @@ -136,6 +136,14 @@ public function process() { } } + $extra = array(); + + if ( ! empty( $dependency->extra ) ) { + foreach ( $dependency->extra as $key => $value ) { + $extra[ $key ] = is_array( $value ) ? count( $value ) : true; + } + } + $this->data['assets'][ $position ][ $handle ] = array( 'host' => $host, 'source' => $source, @@ -145,6 +153,7 @@ public function process() { 'display' => $display, 'dependents' => $dependents, 'dependencies' => $dependencies, + 'extra' => $extra, ); } } diff --git a/output/html/assets.php b/output/html/assets.php index afc8f02a1..a7185f83b 100644 --- a/output/html/assets.php +++ b/output/html/assets.php @@ -62,6 +62,7 @@ public function output() { echo $this->build_filter( $type . '-dependents', $data['dependents'], __( 'Dependents', 'query-monitor' ) ); // WPCS: XSS ok. echo ''; echo '' . esc_html__( 'Version', 'query-monitor' ) . ''; + echo '' . esc_html__( 'Extra', 'query-monitor' ) . ''; echo ''; echo ''; @@ -84,7 +85,7 @@ public function output() { echo ''; printf( - '%1$s', + '%1$s', sprintf( esc_html( $type_label['total'] ), '' . esc_html( number_format_i18n( $total ) ) . '' @@ -107,6 +108,14 @@ protected function dependency_row( $handle, array $asset, $label ) { $qm_host = ( $asset['local'] ) ? 'local' : __( 'Other', 'query-monitor' ); + $extra = array(); + + if ( ! empty( $asset['extra'] ) ) { + foreach ( $asset['extra'] as $key => $count ) { + $extra[] = $key . ( is_numeric( $count ) ? ' (' . $count . ')' : '' ); + } + } + $class = ''; if ( $asset['warning'] ) { @@ -151,6 +160,7 @@ protected function dependency_row( $handle, array $asset, $label ) { echo '' . implode( ', ', array_map( 'esc_html', $asset['dependencies'] ) ) . ''; echo '' . implode( ', ', array_map( 'esc_html', $asset['dependents'] ) ) . ''; echo '' . esc_html( $asset['ver'] ) . ''; + echo '' . implode( ', ', array_map( 'esc_html', $extra ) ) . ''; echo ''; }