enmi-conf.org: comparison wp/wp-admin/includes/class-wp-privacy-requests-table.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 	 * @var string $post_type The post type.
 	 */
 	protected $post_type = 'INVALID';
 	/**
-	 * Get columns to show in the list table.
+	 * Gets columns to show in the list table.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @return string[] Array of column titles keyed by their column name.
 	 */
 		);
 		return $columns;
 	}
 	/**
-	 * Normalize the admin URL to the current page (by request_type).
+	 * Normalizes the admin URL to the current page (by request_type).
 	 *
 	 * @since 5.3.0
 	 *
 	 * @return string URL to the current admin page.
 	 */
 		return admin_url( $pagenow . '.php' );
 	}
 	/**
-	 * Get a list of sortable columns.
+	 * Gets a list of sortable columns.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @return array Default sortable columns.
 	 */
 			'created_timestamp' => array( 'requested', $desc_first ),
 		);
 	}
 	/**
-	 * Default primary column.
+	 * Returns the default primary column.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @return string Default primary column name.
 	 */
 	protected function get_default_primary_column_name() {
 		return 'email';
 	}
 	/**
-	 * Count number of requests for each status.
+	 * Counts the number of requests for each status.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 		return $counts;
 	}
 	/**
-	 * Get an associative array ( id => link ) with the list of views available on this table.
+	 * Gets an associative array ( id => link ) with the list of views available on this table.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @return string[] An array of HTML links keyed by their view.
 	 */
 		$total_requests = absint( array_sum( (array) $counts ) );
 		// Normalized admin URL.
 		$admin_url = $this->get_admin_url();
-		$current_link_attributes = empty( $current_status ) ? ' class="current" aria-current="page"' : '';
+		$status_label = sprintf(
-		$status_label            = sprintf(
 			/* translators: %s: Number of requests. */
 			_nx(
 				'All <span class="count">(%s)</span>',
 				'All <span class="count">(%s)</span>',
 				$total_requests,
 				'requests'
 			),
 			number_format_i18n( $total_requests )
 		);
-		$views['all'] = sprintf(
+		$views['all'] = array(
-			'<a href="%s"%s>%s</a>',
+			'url'     => esc_url( $admin_url ),
-			esc_url( $admin_url ),
+			'label'   => $status_label,
-			$current_link_attributes,
+			'current' => empty( $current_status ),
-			$status_label
 		);
 		foreach ( $statuses as $status => $label ) {
 			$post_status = get_post_status_object( $status );
 			if ( ! $post_status ) {
 				continue;
 			}
-			$current_link_attributes = $status === $current_status ? ' class="current" aria-current="page"' : '';
+			$total_status_requests = absint( $counts->{$status} );
-			$total_status_requests   = absint( $counts->{$status} );
 			if ( ! $total_status_requests ) {
 				continue;
 			}
 				number_format_i18n( $total_status_requests )
 			);
 			$status_link = add_query_arg( 'filter-status', $status, $admin_url );
-			$views[ $status ] = sprintf(
+			$views[ $status ] = array(
-				'<a href="%s"%s>%s</a>',
+				'url'     => esc_url( $status_link ),
-				esc_url( $status_link ),
+				'label'   => $status_label,
-				$current_link_attributes,
+				'current' => $status === $current_status,
-				$status_label
 			);
 		}
-		return $views;
+		return $this->get_views_links( $views );
 	}
 	/**
-	 * Get bulk actions.
+	 * Gets bulk actions.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @return array Array of bulk action labels keyed by their action.
 	 */
 			case 'resend':
 				foreach ( $request_ids as $request_id ) {
 					$resend = _wp_privacy_resend_request( $request_id );
 					if ( $resend && ! is_wp_error( $resend ) ) {
-						$count++;
+						++$count;
 					} else {
-						$failures++;
+						++$failures;
 					}
 				}
 				if ( $failures ) {
 					add_settings_error(
 			case 'complete':
 				foreach ( $request_ids as $request_id ) {
 					$result = _wp_privacy_completed_request( $request_id );
 					if ( $result && ! is_wp_error( $result ) ) {
-						$count++;
+						++$count;
 					}
 				}
 				add_settings_error(
 					'bulk_action',
 				break;
 			case 'delete':
 				foreach ( $request_ids as $request_id ) {
 					if ( wp_delete_post( $request_id, true ) ) {
-						$count++;
+						++$count;
 					} else {
-						$failures++;
+						++$failures;
 					}
 				}
 				if ( $failures ) {
 					add_settings_error(
 				break;
 		}
 	}
 	/**
-	 * Prepare items to output.
+	 * Prepares items to output.
 	 *
 	 * @since 4.9.6
 	 * @since 5.1.0 Added support for column sorting.
 	 */
 	public function prepare_items() {
 			)
 		);
 	}
 	/**
-	 * Checkbox column.
+	 * Returns the markup for the Checkbox column.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @param WP_User_Request $item Item being shown.
 	 * @return string Checkbox column markup.
 	 */
 	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="request_id[]" value="%1$s" /><span class="spinner"></span>', esc_attr( $item->ID ) );
+		return sprintf(
+			'<input type="checkbox" name="request_id[]" id="requester_%1$s" value="%1$s" />' .
+			'<label for="requester_%1$s"><span class="screen-reader-text">%2$s</span></label><span class="spinner"></span>',
+			esc_attr( $item->ID ),
+			/* translators: Hidden accessibility text. %s: Email address. */
+			sprintf( __( 'Select %s' ), $item->email )
+		);
 	}
 	/**
 	 * Status column.
 	 *
 		echo '</span>';
 	}
 	/**
-	 * Convert timestamp for display.
+	 * Converts a timestamp for display.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @param int $timestamp Event timestamp.
 	 * @return string Human readable date.
 		return date_i18n( get_option( 'date_format' ), $timestamp );
 	}
 	/**
-	 * Default column handler.
+	 * Handles the default column.
 	 *
 	 * @since 4.9.6
 	 * @since 5.7.0 Added `manage_{$this->screen->id}_custom_column` action.
 	 *
 	 * @param WP_User_Request $item        Item being shown.
 		 */
 		do_action( "manage_{$this->screen->id}_custom_column", $column_name, $item );
 	}
 	/**
-	 * Created timestamp column. Overridden by children.
+	 * Returns the markup for the Created timestamp column. Overridden by children.
 	 *
 	 * @since 5.7.0
 	 *
 	 * @param WP_User_Request $item Item being shown.
 	 * @return string Human readable date.
 	public function column_email( $item ) {
 		return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( array() ) );
 	}
 	/**
-	 * Next steps column. Overridden by children.
+	 * Returns the markup for the next steps column. Overridden by children.
 	 *
 	 * @since 4.9.6
 	 *
 	 * @param WP_User_Request $item Item being shown.
 	 */
 		$this->single_row_columns( $item );
 		echo '</tr>';
 	}
 	/**
-	 * Embed scripts used to perform actions. Overridden by children.
+	 * Embeds scripts used to perform actions. Overridden by children.
 	 *
 	 * @since 4.9.6
 	 */
 	public function embed_scripts() {}
 }

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef