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

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 /**
 * Core class used to implement displaying themes in a list table for the network admin.
 *
 * @since 3.1.0
-* @access private
 *
 * @see WP_List_Table
 */
 class WP_MS_Themes_List_Table extends WP_List_Table {
 	 * @global string $s
 	 */
 	public function prepare_items() {
 		global $status, $totals, $page, $orderby, $order, $s;
-		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+		$orderby = ! empty( $_REQUEST['orderby'] ) ? sanitize_text_field( $_REQUEST['orderby'] ) : '';
+		$order   = ! empty( $_REQUEST['order'] ) ? sanitize_text_field( $_REQUEST['order'] ) : '';
+		$s       = ! empty( $_REQUEST['s'] ) ? sanitize_text_field( $_REQUEST['s'] ) : '';
 		$themes = array(
 			/**
 			 * Filters the full array of WP_Theme objects to list in the Multisite
 			 * themes list table.
 			_e( 'No themes are currently available.' );
 		}
 	}
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$columns = array(
 			'cb'          => '<input type="checkbox" />',
 			'name'        => __( 'Theme' ),
 	/**
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'name' => 'name',
+			'name' => array( 'name', false, __( 'Theme' ), __( 'Table ordered by Theme Name.' ), 'asc' ),
 		);
 	}
 	/**
 	 * Gets the name of the primary column.
 			} else {
 				$url = 'themes.php';
 			}
 			if ( 'search' !== $type ) {
-				$status_links[ $type ] = sprintf(
+				$status_links[ $type ] = array(
-					"<a href='%s'%s>%s</a>",
+					'url'     => esc_url( add_query_arg( 'theme_status', $type, $url ) ),
-					esc_url( add_query_arg( 'theme_status', $type, $url ) ),
+					'label'   => sprintf( $text, number_format_i18n( $count ) ),
-					( $type === $status ) ? ' class="current" aria-current="page"' : '',
+					'current' => $type === $status,
-					sprintf( $text, number_format_i18n( $count ) )
 				);
 			}
 		}
-		return $status_links;
+		return $this->get_views_links( $status_links );
 	}
 	/**
 	 * @global string $status
 	 *
 	 *
 	 * @param WP_Theme $item The current WP_Theme object.
 	 */
 	public function column_cb( $item ) {
 		// Restores the more descriptive, specific name for use within this method.
-		$theme       = $item;
+		$theme = $item;
 		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
 		?>
 		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" id="<?php echo $checkbox_id; ?>" />
-		<label class="screen-reader-text" for="<?php echo $checkbox_id; ?>" ><?php _e( 'Select' ); ?>  <?php echo $theme->display( 'Name' ); ?></label>
+		<label for="<?php echo $checkbox_id; ?>" >
+			<span class="screen-reader-text">
+			<?php
+			printf(
+				/* translators: Hidden accessibility text. %s: Theme name */
+				__( 'Select %s' ),
+				$theme->display( 'Name' )
+			);
+			?>
+			</span>
+		</label>
 		<?php
 	}
 	/**
 	 * Handles the name column output.
 		 * @param string   $stylesheet Directory name of the theme.
 		 * @param WP_Theme $theme      WP_Theme object.
 		 */
 		echo apply_filters( 'theme_auto_update_setting_html', $html, $stylesheet, $theme );
-		echo '<div class="notice notice-error notice-alt inline hidden"><p></p></div>';
+		wp_admin_notice(
+			'',
+			array(
+				'type'               => 'error',
+				'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+			)
+		);
 	}
 	/**
 	 * Handles default column output.
 	 *
 	 *
 	 * @param WP_Theme $item        The current WP_Theme object.
 	 * @param string   $column_name The current column name.
 	 */
 	public function column_default( $item, $column_name ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$theme = $item;
+		$stylesheet = $theme->get_stylesheet();
 		/**
 		 * Fires inside each custom column of the Multisite themes list table.
 		 *
 		 * @since 3.1.0
 		 *
 		 * @param string   $column_name Name of the column.
 		 * @param string   $stylesheet  Directory name of the theme.
 		 * @param WP_Theme $theme       Current WP_Theme object.
 		 */
-		do_action(
+		do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
-			'manage_themes_custom_column',
-			$column_name,
-			$item->get_stylesheet(), // Directory name of the theme.
-			$item // Theme object.
-		);
 	}
 	/**
 	 * Handles the output for a single table row.
 	 *

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