enmi-conf.org: comparison wp/wp-admin/includes/class-wp-posts-list-table.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	/**
 	 * Helper to create links to edit.php with params.
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param string[] $args  Associative array of URL parameters for the link.
+	 * @param string[] $args      Associative array of URL parameters for the link.
-	 * @param string   $label Link text.
+	 * @param string   $link_text Link text.
-	 * @param string   $class Optional. Class attribute. Default empty string.
+	 * @param string   $css_class Optional. Class attribute. Default empty string.
 	 * @return string The formatted link string.
 	 */
-	protected function get_edit_link( $args, $label, $class = '' ) {
+	protected function get_edit_link( $args, $link_text, $css_class = '' ) {
 		$url = add_query_arg( $args, 'edit.php' );
 		$class_html   = '';
 		$aria_current = '';
-		if ( ! empty( $class ) ) {
+		if ( ! empty( $css_class ) ) {
 			$class_html = sprintf(
 				' class="%s"',
-				esc_attr( $class )
+				esc_attr( $css_class )
 			);
-			if ( 'current' === $class ) {
+			if ( 'current' === $css_class ) {
 				$aria_current = ' aria-current="page"';
 			}
 		}
 		return sprintf(
 			'<a href="%s"%s%s>%s</a>',
 			esc_url( $url ),
 			$class_html,
 			$aria_current,
-			$label
+			$link_text
 		);
 	}
 	/**
 	 * @global array $locked_post_status This seems to be deprecated.
 				return;
 			}
 		}
 		/*
-		 * Arrange pages into two parts: top level pages and children_pages
+		 * Arrange pages into two parts: top level pages and children_pages.
-		 * children_pages is two dimensional array, eg.
+		 * children_pages is two dimensional array. Example:
 		 * children_pages[10][] contains all sub-pages whose parent is 10.
 		 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
 		 * If searching, ignore hierarchy and treat everything as top level
 		 */
 		if ( empty( $_REQUEST['s'] ) ) {
 	 * @since 3.1.0 (Standalone function exists since 2.6.0)
 	 * @since 4.2.0 Added the `$to_display` parameter.
 	 *
 	 * @param array $children_pages
 	 * @param int   $count
-	 * @param int   $parent
+	 * @param int   $parent_page
 	 * @param int   $level
 	 * @param int   $pagenum
 	 * @param int   $per_page
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
-	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
+	private function _page_rows( &$children_pages, &$count, $parent_page, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[ $parent ] ) ) {
+		if ( ! isset( $children_pages[ $parent_page ] ) ) {
 			return;
 		}
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end   = $start + $per_page;
-		foreach ( $children_pages[ $parent ] as $page ) {
+		foreach ( $children_pages[ $parent_page ] as $page ) {
 			if ( $count >= $end ) {
 				break;
 			}
 			// If the page starts in a subtree, print the parents.
 			$count++;
 			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
 		}
-		unset( $children_pages[ $parent ] ); // Required in order to keep track of orphans.
+		unset( $children_pages[ $parent_page ] ); // Required in order to keep track of orphans.
 	}
 	/**
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
-	 *
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
-	 * @param WP_Post $post The current WP_Post object.
+	 *
-	 */
+	 * @param WP_Post $item The current WP_Post object.
-	public function column_cb( $post ) {
+	 */
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post = $item;
 		$show = current_user_can( 'edit_post', $post->ID );
 		/**
 		 * Filters whether to show the bulk edit checkbox for a post in its list table.
 		 *
 	/**
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
-	 *
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
-	 * @param WP_Post $post        The current WP_Post object.
+	 *
+	 * @param WP_Post $item        The current WP_Post object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $post, $column_name ) {
+	public function column_default( $item, $column_name ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post = $item;
 		if ( 'categories' === $column_name ) {
 			$taxonomy = 'category';
 		} elseif ( 'tags' === $column_name ) {
 			$taxonomy = 'post_tag';
 		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
 				 * @param string    $taxonomy   Taxonomy name.
 				 * @param WP_Term[] $terms      Array of term objects appearing in the post row.
 				 */
 				$term_links = apply_filters( 'post_column_taxonomy_links', $term_links, $taxonomy, $terms );
-				/* translators: Used between list items, there is a space after the comma. */
+				echo implode( wp_get_list_item_separator(), $term_links );
-				echo implode( __( ', ' ), $term_links );
 			} else {
 				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
 			}
 			return;
 		}
 	/**
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
-	 *
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
-	 * @param WP_Post $post        Post being acted upon.
+	 *
+	 * @param WP_Post $item        Post being acted upon.
 	 * @param string  $column_name Current column name.
 	 * @param string  $primary     Primary column name.
 	 * @return string Row actions output for posts, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
+		// Restores the more descriptive, specific name for use within this method.
+		$post             = $item;
 		$post_type_object = get_post_type_object( $post->post_type );
 		$can_edit_post    = current_user_can( 'edit_post', $post->ID );
 		$actions          = array();
 		$title            = _draft_or_post_title();
 			$classes  = $inline_edit_classes . ' ';
 			$classes .= $bulk ? $bulk_edit_classes : $quick_edit_classes;
 			?>
 			<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="<?php echo $classes; ?>" style="display: none">
 			<td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
+			<div class="inline-edit-wrapper" role="region" aria-labelledby="<?php echo $bulk ? 'bulk' : 'quick'; ?>-edit-legend">
 			<fieldset class="inline-edit-col-left">
-				<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
+				<legend class="inline-edit-legend" id="<?php echo $bulk ? 'bulk' : 'quick'; ?>-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
 				<div class="inline-edit-col">
 				<?php if ( post_type_supports( $screen->post_type, 'title' ) ) : ?>
 					<?php if ( $bulk ) : ?>
 						<?php if ( is_post_type_viewable( $screen->post_type ) ) : ?>
 							<label>
 								<span class="title"><?php _e( 'Slug' ); ?></span>
-								<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
+								<span class="input-text-wrap"><input type="text" name="post_name" value="" autocomplete="off" spellcheck="false" /></span>
 							</label>
 						<?php endif; // is_post_type_viewable() ?>
 					<?php endif; // $bulk ?>
 				<?php
 				if ( post_type_supports( $screen->post_type, 'author' ) ) {
 					$authors_dropdown = '';
 					if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) {
-						$users_opt = array(
+						$dropdown_name  = 'post_author';
-							'hide_if_only_one_author' => false,
+						$dropdown_class = 'authors';
-							'who'                     => 'authors',
+						if ( wp_is_large_user_count() ) {
-							'name'                    => 'post_author',
+							$authors_dropdown = sprintf( '<select name="%s" class="%s hidden"></select>', esc_attr( $dropdown_name ), esc_attr( $dropdown_class ) );
-							'class'                   => 'authors',
+						} else {
-							'multi'                   => 1,
+							$users_opt = array(
-							'echo'                    => 0,
+								'hide_if_only_one_author' => false,
-							'show'                    => 'display_name_with_login',
+								'capability'              => array( $post_type_object->cap->edit_posts ),
-						);
+								'name'                    => $dropdown_name,
+								'class'                   => $dropdown_class,
-						if ( $bulk ) {
+								'multi'                   => 1,
-							$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+								'echo'                    => 0,
-						}
+								'show'                    => 'display_name_with_login',
+							);
-						/**
-						 * Filters the arguments used to generate the Quick Edit authors drop-down.
+							if ( $bulk ) {
-						 *
+								$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
-						 * @since 5.6.0
+							}
-						 *
-						 * @see wp_dropdown_users()
+							/**
-						 *
+							 * Filters the arguments used to generate the Quick Edit authors drop-down.
-						 * @param array $users_opt An array of arguments passed to wp_dropdown_users().
+							 *
-						 * @param bool  $bulk      A flag to denote if it's a bulk action.
+							 * @since 5.6.0
-						 */
+							 *
-						$users_opt = apply_filters( 'quick_edit_dropdown_authors_args', $users_opt, $bulk );
+							 * @see wp_dropdown_users()
+							 *
-						$authors = wp_dropdown_users( $users_opt );
+							 * @param array $users_opt An array of arguments passed to wp_dropdown_users().
+							 * @param bool $bulk A flag to denote if it's a bulk action.
-						if ( $authors ) {
+							 */
-							$authors_dropdown  = '<label class="inline-edit-author">';
+							$users_opt = apply_filters( 'quick_edit_dropdown_authors_args', $users_opt, $bulk );
-							$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
-							$authors_dropdown .= $authors;
+							$authors = wp_dropdown_users( $users_opt );
-							$authors_dropdown .= '</label>';
+							if ( $authors ) {
+								$authors_dropdown  = '<label class="inline-edit-author">';
+								$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+								$authors_dropdown .= $authors;
+								$authors_dropdown .= '</label>';
+							}
 						}
 					} // current_user_can( 'edit_others_posts' )
 					if ( ! $bulk ) {
 						echo $authors_dropdown;
 					<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
 						<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
 						<input type="hidden" name="<?php echo ( 'category' === $taxonomy->name ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
 						<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">
-							<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
+							<?php wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name ) ); ?>
 						</ul>
 					<?php endforeach; // $hierarchical_taxonomies as $taxonomy ?>
 					</div>
 					<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
 						<?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) : ?>
 							<?php $taxonomy_name = esc_attr( $taxonomy->name ); ?>
+							<div class="inline-edit-tags-wrap">
 							<label class="inline-edit-tags">
 								<span class="title"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
-								<textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>
+								<textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo esc_attr( $taxonomy->name ); ?>]" class="tax_input_<?php echo esc_attr( $taxonomy->name ); ?>" aria-describedby="inline-edit-<?php echo esc_attr( $taxonomy->name ); ?>-desc"></textarea>
 							</label>
+							<p class="howto" id="inline-edit-<?php echo esc_attr( $taxonomy->name ); ?>-desc"><?php echo esc_html( $taxonomy->labels->separate_items_with_commas ); ?></p>
+							</div>
 						<?php endif; // current_user_can( 'assign_terms' ) ?>
 					<?php endforeach; // $flat_taxonomies as $taxonomy ?>
 				<?php endif; // count( $flat_taxonomies ) && ! $bulk ?>
 				}
 			}
 			?>
 			<div class="submit inline-edit-save">
-				<button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
 				<?php if ( ! $bulk ) : ?>
 					<?php wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?>
-					<button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
+					<button type="button" class="button button-primary save"><?php _e( 'Update' ); ?></button>
+				<?php else : ?>
+					<?php submit_button( __( 'Update' ), 'primary', 'bulk_edit', false ); ?>
+				<?php endif; ?>
+				<button type="button" class="button cancel"><?php _e( 'Cancel' ); ?></button>
+				<?php if ( ! $bulk ) : ?>
 					<span class="spinner"></span>
-				<?php else : ?>
-					<?php submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false ); ?>
 				<?php endif; ?>
 				<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
 				<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
 				<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) : ?>
 					<input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
 				<?php endif; ?>
-				<br class="clear" />
 				<div class="notice notice-error notice-alt inline hidden">
 					<p class="error"></p>
 				</div>
 			</div>
+		</div> <!-- end of .inline-edit-wrapper -->
 			</td></tr>
 			<?php
 			$bulk++;

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6