enmi-conf.org: comparison wp/wp-admin/includes/template.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 * A Big Mess. Also some neat functions that are nicely written.
 *
 * @package WordPress
 * @subpackage Administration
 */
+/** Walker_Category_Checklist class */
+require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );
+/** WP_Internal_Pointers class */
+require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
 //
 // Category Checklists
 //
-/**
-* Walker to output an unordered list of category checkbox input elements.
-*
-* @since 2.5.1
-*
-* @see Walker
-* @see wp_category_checklist()
-* @see wp_terms_checklist()
-*/
-class Walker_Category_Checklist extends Walker {
-	public $tree_type = 'category';
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
-	/**
-	 * Starts the list before the elements are added.
-	 *
-	 * @see Walker:start_lvl()
-	 *
-	 * @since 2.5.1
-	 *
-	 * @param string $output Passed by reference. Used to append additional content.
-	 * @param int    $depth  Depth of category. Used for tab indentation.
-	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
-	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat("\t", $depth);
-		$output .= "$indent<ul class='children'>\n";
-	}
-	/**
-	 * Ends the list of after the elements are added.
-	 *
-	 * @see Walker::end_lvl()
-	 *
-	 * @since 2.5.1
-	 *
-	 * @param string $output Passed by reference. Used to append additional content.
-	 * @param int    $depth  Depth of category. Used for tab indentation.
-	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
-	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat("\t", $depth);
-		$output .= "$indent</ul>\n";
-	}
-	/**
-	 * Start the element output.
-	 *
-	 * @see Walker::start_el()
-	 *
-	 * @since 2.5.1
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 * @param int    $id       ID of the current term.
-	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		if ( empty( $args['taxonomy'] ) ) {
-			$taxonomy = 'category';
-		} else {
-			$taxonomy = $args['taxonomy'];
-		}
-		if ( $taxonomy == 'category' ) {
-			$name = 'post_category';
-		} else {
-			$name = 'tax_input[' . $taxonomy . ']';
-		}
-		$args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
-		$class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
-		$args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
-		/** This filter is documented in wp-includes/category-template.php */
-		if ( ! empty( $args['list_only'] ) ) {
-			$aria_cheched = 'false';
-			$inner_class = 'category';
-			if ( in_array( $category->term_id, $args['selected_cats'] ) ) {
-				$inner_class .= ' selected';
-				$aria_cheched = 'true';
-			}
-			$output .= "\n" . '<li' . $class . '>' .
-				'<div class="' . $inner_class . '" data-term-id=' . $category->term_id .
-				' tabindex="0" role="checkbox" aria-checked="' . $aria_cheched . '">' .
-				esc_html( apply_filters( 'the_category', $category->name ) ) . '</div>';
-		} else {
-			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
-				'<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
-				checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
-				disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
-				esc_html( apply_filters( 'the_category', $category->name ) ) . '</label>';
-		}
-	}
-	/**
-	 * Ends the element output, if needed.
-	 *
-	 * @see Walker::end_el()
-	 *
-	 * @since 2.5.1
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
-		$output .= "</li>\n";
-	}
-}
 /**
 * Output an unordered list of checkbox input elements labeled with category names.
 *
 * @since 2.5.1
 * Output an unordered list of checkbox input elements labelled with term names.
 *
 * Taxonomy-independent version of wp_category_checklist().
 *
 * @since 3.0.0
+* @since 4.4.0 Introduced the `$echo` argument.
 *
 * @param int          $post_id Optional. Post ID. Default 0.
 * @param array|string $args {
 *     Optional. Array or string of arguments for generating a terms checklist. Default empty array.
 *
 *     @type object $walker               Walker object to use to build the output.
 *                                        Default is a Walker_Category_Checklist instance.
 *     @type string $taxonomy             Taxonomy to generate the checklist for. Default 'category'.
 *     @type bool   $checked_ontop        Whether to move checked items out of the hierarchy and to
 *                                        the top of the list. Default true.
+*     @type bool   $echo                 Whether to echo the generated markup. False to return the markup instead
+*                                        of echoing it. Default true.
 * }
 */
 function wp_terms_checklist( $post_id = 0, $args = array() ) {
 	$defaults = array(
 		'descendants_and_self' => 0,
 		'selected_cats' => false,
 		'popular_cats' => false,
 		'walker' => null,
 		'taxonomy' => 'category',
-		'checked_ontop' => true
+		'checked_ontop' => true,
+		'echo' => true,
 	);
 	/**
-	 * Filter the taxonomy terms checklist arguments.
+	 * Filters the taxonomy terms checklist arguments.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @see wp_terms_checklist()
 	 *
 		array_unshift( $categories, $self );
 	} else {
 		$categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
 	}
+	$output = '';
 	if ( $r['checked_ontop'] ) {
 		// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 		$checked_categories = array();
 		$keys = array_keys( $categories );
-		foreach( $keys as $k ) {
+		foreach ( $keys as $k ) {
 			if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
 				$checked_categories[] = $categories[$k];
 				unset( $categories[$k] );
 			}
 		}
 		// Put checked cats on top
-		echo call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
+		$output .= call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
 	}
 	// Then the rest of them
-	echo call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+	$output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+	if ( $r['echo'] ) {
+		echo $output;
+	}
+	return $output;
 }
 /**
 * Retrieve a list of the most popular terms from the specified taxonomy.
 *
 	$tax = get_taxonomy($taxonomy);
 	$popular_ids = array();
 	foreach ( (array) $terms as $term ) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // hack for AJAX use
+		if ( !$echo ) // Hack for Ajax use.
 			continue;
 		$id = "popular-$taxonomy-$term->term_id";
 		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
 		?>
 		<li id="<?php echo $id; ?>" class="popular-category">
 			<label class="selectit">
 				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can( $tax->cap->assign_terms ) ); ?> />
 				<?php
 				/** This filter is documented in wp-includes/category-template.php */
-				echo esc_html( apply_filters( 'the_category', $term->name ) );
+				echo esc_html( apply_filters( 'the_category', $term->name, '', '' ) );
 				?>
 			</label>
 		</li>
 		<?php
 	}
 	return $popular_ids;
 }
 /**
-* {@internal Missing Short Description}}
+* Outputs a link category checklist element.
 *
 * @since 2.5.1
 *
 * @param int $link_id
 */
 	foreach ( $categories as $category ) {
 		$cat_id = $category->term_id;
 		/** This filter is documented in wp-includes/category-template.php */
-		$name = esc_html( apply_filters( 'the_category', $category->name ) );
+		$name = esc_html( apply_filters( 'the_category', $category->name, '', '' ) );
 		$checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
 		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
 	}
 }
 	$title = esc_textarea( trim( $post->post_title ) );
 	/** This filter is documented in wp-admin/edit-tag-form.php */
 	echo '
 <div class="hidden" id="inline_' . $post->ID . '">
-	<div class="post_title">' . $title . '</div>
+	<div class="post_title">' . $title . '</div>' .
-	<div class="post_name">' . apply_filters( 'editable_slug', $post->post_name ) . '</div>
+	/** This filter is documented in wp-admin/edit-tag-form.php */
+	'<div class="post_name">' . apply_filters( 'editable_slug', $post->post_name, $post ) . '</div>
 	<div class="post_author">' . $post->post_author . '</div>
 	<div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
 	<div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
 	<div class="_status">' . esc_html( $post->post_status ) . '</div>
 	<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
 	<div class="hh">' . mysql2date( 'H', $post->post_date, false ) . '</div>
 	<div class="mn">' . mysql2date( 'i', $post->post_date, false ) . '</div>
 	<div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
 	<div class="post_password">' . esc_html( $post->post_password ) . '</div>';
-	if ( $post_type_object->hierarchical )
+	if ( $post_type_object->hierarchical ) {
 		echo '<div class="post_parent">' . $post->post_parent . '</div>';
+	}
-	if ( $post->post_type == 'page' )
-		echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
+	echo '<div class="page_template">' . ( $post->page_template ? esc_html( $post->page_template ) : 'default' ) . '</div>';
-	if ( post_type_supports( $post->post_type, 'page-attributes' ) )
+	if ( post_type_supports( $post->post_type, 'page-attributes' ) ) {
 		echo '<div class="menu_order">' . $post->menu_order . '</div>';
+	}
 	$taxonomy_names = get_object_taxonomies( $post->post_type );
 	foreach ( $taxonomy_names as $taxonomy_name) {
 		$taxonomy = get_taxonomy( $taxonomy_name );
 		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
 			$terms = get_object_term_cache( $post->ID, $taxonomy_name );
 			if ( false === $terms ) {
 				$terms = wp_get_object_terms( $post->ID, $taxonomy_name );
-				wp_cache_add( $post->ID, $terms, $taxonomy_name . '_relationships' );
+				wp_cache_add( $post->ID, wp_list_pluck( $terms, 'term_id' ), $taxonomy_name . '_relationships' );
 			}
 			$term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' );
 			echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">' . implode( ',', $term_ids ) . '</div>';
 		} elseif ( $taxonomy->show_ui ) {
+			$terms_to_edit = get_terms_to_edit( $post->ID, $taxonomy_name );
+			if ( ! is_string( $terms_to_edit ) ) {
+				$terms_to_edit = '';
+			}
 			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
-				. esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '</div>';
+				. esc_html( str_replace( ',', ', ', $terms_to_edit ) ) . '</div>';
 		}
 	}
 	if ( !$post_type_object->hierarchical )
 		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
 	if ( post_type_supports( $post->post_type, 'post-formats' ) )
 		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	/**
+	 * Fires after outputting the fields for the inline editor for posts and pages.
+	 *
+	 * @since 4.9.8
+	 *
+	 * @param WP_Post      $post             The current post object.
+	 * @param WP_Post_Type $post_type_object The current post's post type object.
+	 */
+	do_action( 'add_inline_data', $post, $post_type_object );
 	echo '</div>';
 }
 /**
-* {@internal Missing Short Description}}
+* Outputs the in-line comment reply-to form in the Comments list table.
 *
 * @since 2.7.0
 *
-* @param int $position
+* @global WP_List_Table $wp_list_table
-* @param bool $checkbox
+*
+* @param int    $position
+* @param bool   $checkbox
 * @param string $mode
-* @param bool $table_row
+* @param bool   $table_row
 */
 function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
 	global $wp_list_table;
 	/**
-	 * Filter the in-line comment reply-to form output in the Comments
+	 * Filters the in-line comment reply-to form output in the Comments
 	 * list table.
 	 *
 	 * Returning a non-empty value here will short-circuit display
 	 * of the in-line comment-reply form in the Comments list table,
 	 * echoing the returned value instead.
 	}
 ?>
 <form method="get">
 <?php if ( $table_row ) : ?>
-<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
+<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
-	<div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div>
+	<fieldset class="comment-reply">
-	<div id="addhead" style="display:none;"><h5><?php _e('Add new Comment'); ?></h5></div>
+	<legend>
-	<div id="edithead" style="display:none;">
+		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
-		<div class="inside">
+		<span class="hidden" id="replyhead"><?php _e( 'Reply to Comment' ); ?></span>
-		<label for="author"><?php _e('Name') ?></label>
+		<span class="hidden" id="addhead"><?php _e( 'Add new Comment' ); ?></span>
-		<input type="text" name="newcomment_author" size="50" value="" id="author" />
+	</legend>
-		</div>
-		<div class="inside">
-		<label for="author-email"><?php _e('E-mail') ?></label>
-		<input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
-		</div>
-		<div class="inside">
-		<label for="author-url"><?php _e('URL') ?></label>
-		<input type="text" id="author-url" name="newcomment_author_url" class="code" size="103" value="" />
-		</div>
-		<div style="clear:both;"></div>
-	</div>
 	<div id="replycontainer">
+	<label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
 	<?php
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
 	wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
 	?>
 	</div>
-	<p id="replysubmit" class="submit">
+	<div id="edithead" style="display:none;">
-	<a href="#comments-form" class="save button-primary alignright">
+		<div class="inside">
-	<span id="addbtn" style="display:none;"><?php _e('Add Comment'); ?></span>
+		<label for="author-name"><?php _e( 'Name' ) ?></label>
-	<span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
+		<input type="text" name="newcomment_author" size="50" value="" id="author-name" />
-	<span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
+		</div>
-	<a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
-	<span class="waiting spinner"></span>
+		<div class="inside">
-	<span class="error" style="display:none;"></span>
+		<label for="author-email"><?php _e('Email') ?></label>
-	<br class="clear" />
+		<input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
-	</p>
+		</div>
+		<div class="inside">
+		<label for="author-url"><?php _e('URL') ?></label>
+		<input type="text" id="author-url" name="newcomment_author_url" class="code" size="103" value="" />
+		</div>
+	</div>
+	<div id="replysubmit" class="submit">
+		<p>
+			<a href="#comments-form" class="save button button-primary alignright">
+				<span id="addbtn" style="display: none;"><?php _e( 'Add Comment' ); ?></span>
+				<span id="savebtn" style="display: none;"><?php _e( 'Update Comment' ); ?></span>
+				<span id="replybtn" style="display: none;"><?php _e( 'Submit Reply' ); ?></span>
+			</a>
+			<a href="#comments-form" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></a>
+			<span class="waiting spinner"></span>
+		</p>
+		<br class="clear" />
+		<div class="notice notice-error notice-alt inline hidden">
+			<p class="error"></p>
+		</div>
+	</div>
 	<input type="hidden" name="action" id="action" value="" />
 	<input type="hidden" name="comment_ID" id="comment_ID" value="" />
 	<input type="hidden" name="comment_post_ID" id="comment_post_ID" value="" />
 	<input type="hidden" name="status" id="status" value="" />
 	<?php
 		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
 		if ( current_user_can( 'unfiltered_html' ) )
 			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
 	?>
+	</fieldset>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
 <?php else : ?>
 </div></div>
 <?php endif; ?>
 </div>
 <?php
 }
 /**
-* {@internal Missing Short Description}}
+* Outputs a post's public meta data in the Custom Fields meta box.
 *
 * @since 1.2.0
 *
 * @param array $meta
 */
 </table>
 <?php
 }
 /**
-* {@internal Missing Short Description}}
+* Outputs a single row of public meta data in the Custom Fields meta box.
 *
 * @since 2.5.0
+*
+* @staticvar string $update_nonce
 *
 * @param array $entry
 * @param int   $count
 * @return string
 */
 function _list_meta_row( $entry, &$count ) {
-	static $update_nonce = false;
+	static $update_nonce = '';
 	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
 		return '';
-	if ( !$update_nonce )
+	if ( ! $update_nonce )
 		$update_nonce = wp_create_nonce( 'add-meta' );
 	$r = '';
 	++ $count;
 /**
 * Prints the form in the Custom Fields meta box.
 *
 * @since 1.2.0
 *
+* @global wpdb $wpdb WordPress database abstraction object.
+*
 * @param WP_Post $post Optional. The post being edited.
 */
 function meta_form( $post = null ) {
 	global $wpdb;
 	$post = get_post( $post );
 	/**
-	 * Filter the number of custom fields to retrieve for the drop-down
+	 * Filters values for the meta key dropdown in the Custom Fields meta box.
-	 * in the Custom Fields meta box.
 	 *
-	 * @since 2.1.0
+	 * Returning a non-null value will effectively short-circuit and avoid a
+	 * potentially expensive query against postmeta.
 	 *
-	 * @param int $limit Number of custom fields to retrieve. Default 30.
+	 * @since 4.4.0
+	 *
+	 * @param array|null $keys Pre-defined meta keys to be used in place of a postmeta query. Default null.
+	 * @param WP_Post    $post The current post object.
 	 */
-	$limit = apply_filters( 'postmeta_form_limit', 30 );
+	$keys = apply_filters( 'postmeta_form_keys', null, $post );
-	$sql = "SELECT meta_key
-		FROM $wpdb->postmeta
+	if ( null === $keys ) {
-		GROUP BY meta_key
+		/**
-		HAVING meta_key NOT LIKE %s
+		 * Filters the number of custom fields to retrieve for the drop-down
-		ORDER BY meta_key
+		 * in the Custom Fields meta box.
-		LIMIT %d";
+		 *
-	$keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
+		 * @since 2.1.0
+		 *
+		 * @param int $limit Number of custom fields to retrieve. Default 30.
+		 */
+		$limit = apply_filters( 'postmeta_form_limit', 30 );
+		$sql = "SELECT DISTINCT meta_key
+			FROM $wpdb->postmeta
+			WHERE meta_key NOT BETWEEN '_' AND '_z'
+			HAVING meta_key NOT LIKE %s
+			ORDER BY meta_key
+			LIMIT %d";
+		$keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
+	}
 	if ( $keys ) {
 		natcasesort( $keys );
 		$meta_key_input_id = 'metakeyselect';
 	} else {
 		$meta_key_input_id = 'metakeyinput';
 <td><textarea id="metavalue" name="metavalue" rows="2" cols="25"></textarea></td>
 </tr>
 <tr><td colspan="2">
 <div class="submit">
-<?php submit_button( __( 'Add Custom Field' ), 'secondary', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
+<?php submit_button( __( 'Add Custom Field' ), '', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
 </div>
 <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
 </tbody>
 </table>
 /**
 * Print out HTML form date elements for editing post or comment publish date.
 *
 * @since 0.71
+* @since 4.4.0 Converted to use get_comment() instead of the global `$comment`.
+*
+* @global WP_Locale  $wp_locale
 *
 * @param int|bool $edit      Accepts 1|true for editing the date, 0|false for adding the date.
 * @param int|bool $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
 * @param int      $tab_index The tabindex attribute to add. Default 0.
 * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
 *                            Default 0|false.
 */
 function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
-	global $wp_locale, $comment;
+	global $wp_locale;
 	$post = get_post();
 	if ( $for_post )
 		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
 	// todo: Remove this?
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
 	$time_adj = current_time('timestamp');
-	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
+	$post_date = ($for_post) ? $post->post_date : get_comment()->comment_date;
 	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
 	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
 	$aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
 	$hh = ($edit) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
 	$mn = ($edit) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
 	$cur_mm = gmdate( 'm', $time_adj );
 	$cur_aa = gmdate( 'Y', $time_adj );
 	$cur_hh = gmdate( 'H', $time_adj );
 	$cur_mn = gmdate( 'i', $time_adj );
-	$month = '<label for="mm" class="screen-reader-text">' . __( 'Month' ) . '</label><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
+	$month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
 	for ( $i = 1; $i < 13; $i = $i +1 ) {
 		$monthnum = zeroise($i, 2);
-		$month .= "\t\t\t" . '<option value="' . $monthnum . '" ' . selected( $monthnum, $mm, false ) . '>';
+		$monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
+		$month .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
 		/* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
-		$month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) ) . "</option>\n";
+		$month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "</option>\n";
 	}
-	$month .= '</select>';
+	$month .= '</select></label>';
-	$day = '<label for="jj" class="screen-reader-text">' . __( 'Day' ) . '</label><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
+	$day = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$year = '<label for="aa" class="screen-reader-text">' . __( 'Year' ) . '</label><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" />';
+	$year = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$hour = '<label for="hh" class="screen-reader-text">' . __( 'Hour' ) . '</label><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
+	$hour = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$minute = '<label for="mn" class="screen-reader-text">' . __( 'Minute' ) . '</label><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
+	$minute = '<label><span class="screen-reader-text">' . __( 'Minute' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
 	echo '<div class="timestamp-wrap">';
 	/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-	printf( __( '%1$s %2$s, %3$s @ %4$s : %5$s' ), $month, $day, $year, $hour, $minute );
+	printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 	if ( $multi ) return;
 /**
 * Print out option HTML elements for the page templates drop-down.
 *
 * @since 1.5.0
-*
+* @since 4.7.0 Added the `$post_type` parameter.
-* @param string $default Optional. The template file name. Default empty.
+*
-*/
+* @param string $default   Optional. The template file name. Default empty.
-function page_template_dropdown( $default = '' ) {
+* @param string $post_type Optional. Post type to get templates for. Default 'post'.
-	$templates = get_page_templates( get_post() );
+*/
+function page_template_dropdown( $default = '', $post_type = 'page' ) {
+	$templates = get_page_templates( null, $post_type );
 	ksort( $templates );
 	foreach ( array_keys( $templates ) as $template ) {
 		$selected = selected( $default, $templates[ $template ], false );
-		echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";
+		echo "\n\t<option value='" . esc_attr( $templates[ $template ] ) . "' $selected>" . esc_html( $template ) . "</option>";
 	}
 }
 /**
 * Print out option HTML elements for the page parents drop-down.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 `$post` argument was added.
-* @param int $default Optional. The default page ID to be pre-selected. Default 0.
+*
-* @param int $parent  Optional. The parent page ID. Default 0.
+* @global wpdb $wpdb WordPress database abstraction object.
-* @param int $level   Optional. Page depth level. Default 0.
+*
+* @param int         $default Optional. The default page ID to be pre-selected. Default 0.
+* @param int         $parent  Optional. The parent page ID. Default 0.
+* @param int         $level   Optional. Page depth level. Default 0.
+* @param int|WP_Post $post    Post ID or WP_Post object.
 *
 * @return null|false Boolean False if page has no children, otherwise print out html elements
 */
-function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
+function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
 	global $wpdb;
-	$post = get_post();
+	$post = get_post( $post );
 	$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
 	if ( $items ) {
 		foreach ( $items as $item ) {
 			// A page cannot be its own parent.
 * @since 2.1.0
 *
 * @param string $selected Slug for the role that should be already selected.
 */
 function wp_dropdown_roles( $selected = '' ) {
-	$p = '';
 	$r = '';
 	$editable_roles = array_reverse( get_editable_roles() );
 	foreach ( $editable_roles as $role => $details ) {
 		$name = translate_user_role($details['name'] );
-		if ( $selected == $role ) // preselect specified role
+		// preselect specified role
-			$p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
+		if ( $selected == $role ) {
-		else
+			$r .= "\n\t<option selected='selected' value='" . esc_attr( $role ) . "'>$name</option>";
-			$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+		} else {
-	}
+			$r .= "\n\t<option value='" . esc_attr( $role ) . "'>$name</option>";
-	echo $p . $r;
+		}
+	}
+	echo $r;
 }
 /**
 * Outputs the form used by the importers to accept the data to be imported
 *
 * @param string $action The action attribute for the form.
 */
 function wp_import_upload_form( $action ) {
 	/**
-	 * Filter the maximum allowed upload size for import files.
+	 * Filters the maximum allowed upload size for import files.
 	 *
 	 * @since 2.3.0
 	 *
 	 * @see wp_max_upload_size()
 	 *
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
 <input type="file" id="upload" name="import" size="25" />
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<?php submit_button( __('Upload file and import'), 'button' ); ?>
+<?php submit_button( __('Upload file and import'), 'primary' ); ?>
 </form>
 <?php
 	endif;
 }
 /**
-* Add a meta box to an edit form.
+* Adds a meta box to one or more screens.
 *
 * @since 2.5.0
-*
+* @since 4.4.0 The `$screen` parameter now accepts an array of screen IDs.
-* @param string           $id            String for use in the 'id' attribute of tags.
+*
-* @param string           $title         Title of the meta box.
+* @global array $wp_meta_boxes
-* @param callback         $callback      Function that fills the box with the desired content.
+*
-*                                        The function should echo its output.
+* @param string                 $id            Meta box ID (used in the 'id' attribute for the meta box).
-* @param string|WP_Screen $screen        Optional. The screen on which to show the box (like a post
+* @param string                 $title         Title of the meta box.
-*                                        type, 'link', or 'comment'). Default is the current screen.
+* @param callable               $callback      Function that fills the box with the desired content.
-* @param string           $context       Optional. The context within the screen where the boxes
+*                                              The function should echo its output.
-*                                        should display. Available contexts vary from screen to
+* @param string|array|WP_Screen $screen        Optional. The screen or screens on which to show the box
-*                                        screen. Post edit screen contexts include 'normal', 'side',
+*                                              (such as a post type, 'link', or 'comment'). Accepts a single
-*                                        and 'advanced'. Comments screen contexts include 'normal'
+*                                              screen ID, WP_Screen object, or array of screen IDs. Default
-*                                        and 'side'. Menus meta boxes (accordion sections) all use
+*                                              is the current screen.  If you have used add_menu_page() or
-*                                        the 'side' context. Global default is 'advanced'.
+*                                              add_submenu_page() to create a new screen (and hence screen_id),
-* @param string           $priority      Optional. The priority within the context where the boxes
+*                                              make sure your menu slug conforms to the limits of sanitize_key()
-*                                        should show ('high', 'low'). Default 'default'.
+*                                              otherwise the 'screen' menu may not correctly render on your page.
-* @param array            $callback_args Optional. Data that should be set as the $args property
+* @param string                 $context       Optional. The context within the screen where the boxes
-*                                        of the box array (which is the second parameter passed
+*                                              should display. Available contexts vary from screen to
-*                                        to your callback). Default null.
+*                                              screen. Post edit screen contexts include 'normal', 'side',
+*                                              and 'advanced'. Comments screen contexts include 'normal'
+*                                              and 'side'. Menus meta boxes (accordion sections) all use
+*                                              the 'side' context. Global default is 'advanced'.
+* @param string                 $priority      Optional. The priority within the context where the boxes
+*                                              should show ('high', 'low'). Default 'default'.
+* @param array                  $callback_args Optional. Data that should be set as the $args property
+*                                              of the box array (which is the second parameter passed
+*                                              to your callback). Default null.
 */
 function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null ) {
 	global $wp_meta_boxes;
-	if ( empty( $screen ) )
+	if ( empty( $screen ) ) {
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
+	} elseif ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	} elseif ( is_array( $screen ) ) {
+		foreach ( $screen as $single_screen ) {
+			add_meta_box( $id, $title, $callback, $single_screen, $context, $priority, $callback_args );
+		}
+	}
+	if ( ! isset( $screen->id ) ) {
+		return;
+	}
 	$page = $screen->id;
 	if ( !isset($wp_meta_boxes) )
 		$wp_meta_boxes = array();
 /**
 * Meta-Box template function
 *
 * @since 2.5.0
 *
+* @global array $wp_meta_boxes
+*
 * @staticvar bool $already_sorted
-* @param string|WP_Screen $screen Screen identifier
+*
-* @param string $context box context
+* @param string|WP_Screen $screen  Screen identifier. If you have used add_menu_page() or
-* @param mixed $object gets passed to the box callback function as first parameter
+*                                  add_submenu_page() to create a new screen (and hence screen_id)
+*                                  make sure your menu slug conforms to the limits of sanitize_key()
+*                                  otherwise the 'screen' menu may not correctly render on your page.
+* @param string           $context box context
+* @param mixed            $object  gets passed to the box callback function as first parameter
 * @return int number of meta_boxes
 */
 function do_meta_boxes( $screen, $context, $object ) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 	$page = $screen->id;
 	$hidden = get_hidden_meta_boxes( $screen );
-	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
+	printf( '<div id="%s-sortables" class="meta-box-sortables">', esc_attr( $context ) );
 	// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
 	if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
 		foreach ( $sorted as $box_context => $ids ) {
 			foreach ( explode( ',', $ids ) as $id ) {
 					if ( false == $box || ! $box['title'] )
 						continue;
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
 					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-					if ( 'dashboard_browser_nag' != $box['id'] )
+					if ( 'dashboard_browser_nag' != $box['id'] ) {
-						echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
+						$widget_title = $box[ 'title' ];
-					echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
+						if ( is_array( $box[ 'args' ] ) && isset( $box[ 'args' ][ '__widget_basename' ] ) ) {
+							$widget_title = $box[ 'args' ][ '__widget_basename' ];
+							// Do not pass this parameter to the user callback function.
+							unset( $box[ 'args' ][ '__widget_basename' ] );
+						}
+						echo '<button type="button" class="handlediv" aria-expanded="true">';
+						echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $widget_title ) . '</span>';
+						echo '<span class="toggle-indicator" aria-hidden="true"></span>';
+						echo '</button>';
+					}
+					echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
 					echo '<div class="inside">' . "\n";
 					call_user_func($box['callback'], $object, $box);
 					echo "</div>\n";
 					echo "</div>\n";
 				}
 	return $i;
 }
 /**
-* Remove a meta box from an edit form.
+* Removes a meta box from one or more screens.
 *
 * @since 2.6.0
-*
+* @since 4.4.0 The `$screen` parameter now accepts an array of screen IDs.
-* @param string $id String for use in the 'id' attribute of tags.
+*
-* @param string|object $screen The screen on which to show the box (post, page, link).
+* @global array $wp_meta_boxes
-* @param string $context The context within the page where the boxes should show ('normal', 'advanced').
+*
-*/
+* @param string                 $id      Meta box ID (used in the 'id' attribute for the meta box).
-function remove_meta_box($id, $screen, $context) {
+* @param string|array|WP_Screen $screen  The screen or screens on which the meta box is shown (such as a
+*                                        post type, 'link', or 'comment'). Accepts a single screen ID,
+*                                        WP_Screen object, or array of screen IDs.
+* @param string                 $context The context within the screen where the box is set to display.
+*                                        Contexts vary from screen to screen. Post edit screen contexts
+*                                        include 'normal', 'side', and 'advanced'. Comments screen contexts
+*                                        include 'normal' and 'side'. Menus meta boxes (accordion sections)
+*                                        all use the 'side' context.
+*/
+function remove_meta_box( $id, $screen, $context ) {
 	global $wp_meta_boxes;
-	if ( empty( $screen ) )
+	if ( empty( $screen ) ) {
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
+	} elseif ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	} elseif ( is_array( $screen ) ) {
+		foreach ( $screen as $single_screen ) {
+			remove_meta_box( $id, $single_screen, $context );
+		}
+	}
+	if ( ! isset( $screen->id ) ) {
+		return;
+	}
 	$page = $screen->id;
 	if ( !isset($wp_meta_boxes) )
 		$wp_meta_boxes = array();
 }
 /**
 * Meta Box Accordion Template Function
 *
-* Largely made up of abstracted code from {@link do_meta_boxes()}, this
+* Largely made up of abstracted code from do_meta_boxes(), this
 * function serves to build meta boxes as list items for display as
 * a collapsible accordion.
 *
 * @since 3.6.0
 *
 * @uses global $wp_meta_boxes Used to retrieve registered meta boxes.
 *
-* @param string|object $screen The screen identifier.
+* @param string|object $screen  The screen identifier.
-* @param string $context The meta box context.
+* @param string        $context The meta box context.
-* @param mixed $object gets passed to the section callback function as first parameter.
+* @param mixed         $object  gets passed to the section callback function as first parameter.
 * @return int number of meta boxes as accordion sections.
 */
 function do_accordion_sections( $screen, $context, $object ) {
 	global $wp_meta_boxes;
 					}
 					?>
 					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
 						<h3 class="accordion-section-title hndle" tabindex="0">
 							<?php echo esc_html( $box['title'] ); ?>
-							<span class="screen-reader-text"><?php _e( 'Press return or enter to expand' ); ?></span>
+							<span class="screen-reader-text"><?php _e( 'Press return or enter to open this section' ); ?></span>
 						</h3>
 						<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
 							<div class="inside">
 								<?php call_user_func( $box['callback'], $object, $box ); ?>
 							</div><!-- .inside -->
 *
 * @since 2.7.0
 *
 * @global $wp_settings_sections Storage array of all settings sections added to admin pages
 *
-* @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
+* @param string   $id       Slug-name to identify the section. Used in the 'id' attribute of tags.
-* @param string $title Formatted title of the section. Shown as the heading for the section.
+* @param string   $title    Formatted title of the section. Shown as the heading for the section.
-* @param string $callback Function that echos out any content at the top of the section (between heading and fields).
+* @param callable $callback Function that echos out any content at the top of the section (between heading and fields).
-* @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page();
+* @param string   $page     The slug-name of the settings page on which to show the section. Built-in pages include
+*                           'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using
+*                           add_options_page();
 */
 function add_settings_section($id, $title, $callback, $page) {
 	global $wp_settings_sections;
 	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+		_deprecated_argument( __FUNCTION__, '3.0.0',
+			/* translators: %s: misc */
+			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+				'misc'
+			)
+		);
 		$page = 'general';
 	}
 	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+		_deprecated_argument( __FUNCTION__, '3.5.0',
+			/* translators: %s: privacy */
+			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+				'privacy'
+			)
+		);
 		$page = 'reading';
 	}
 	$wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
 }
 * @since 2.7.0
 * @since 4.2.0 The `$class` argument was added.
 *
 * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections
 *
-* @param string $id       Slug-name to identify the field. Used in the 'id' attribute of tags.
+* @param string   $id       Slug-name to identify the field. Used in the 'id' attribute of tags.
-* @param string $title    Formatted title of the field. Shown as the label for the field
+* @param string   $title    Formatted title of the field. Shown as the label for the field
-*                         during output.
+*                           during output.
-* @param string $callback Function that fills the field with the desired form inputs. The
+* @param callable $callback Function that fills the field with the desired form inputs. The
-*                         function should echo its output.
+*                           function should echo its output.
-* @param string $page     The slug-name of the settings page on which to show the section
+* @param string   $page     The slug-name of the settings page on which to show the section
-*                         (general, reading, writing, ...).
+*                           (general, reading, writing, ...).
-* @param string $section  Optional. The slug-name of the section of the settings page
+* @param string   $section  Optional. The slug-name of the section of the settings page
-*                         in which to show the box. Default 'default'.
+*                           in which to show the box. Default 'default'.
-* @param array  $args {
+* @param array    $args {
 *     Optional. Extra arguments used when outputting the field.
 *
 *     @type string $label_for When supplied, the setting title will be wrapped
 *                             in a `<label>` element, its `for` attribute populated
 *                             with this value.
 */
 function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
 	global $wp_settings_fields;
 	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
+		_deprecated_argument( __FUNCTION__, '3.0.0',
+			/* translators: %s: misc */
+			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+				'misc'
+			)
+		);
 		$page = 'general';
 	}
 	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5', __( 'The privacy options group has been removed. Use another settings group.' ) );
+		_deprecated_argument( __FUNCTION__, '3.5.0',
+			/* translators: %s: privacy */
+			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+				'privacy'
+			)
+		);
 		$page = 'reading';
 	}
 	$wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args);
 }
 *
 * @global $wp_settings_sections Storage array of all settings sections added to admin pages
 * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections
 * @since 2.7.0
 *
-* @param string $page The slug name of the page whos settings sections you want to output
+* @param string $page The slug name of the page whose settings sections you want to output
 */
 function do_settings_sections( $page ) {
 	global $wp_settings_sections, $wp_settings_fields;
 	if ( ! isset( $wp_settings_sections[$page] ) )
 		return;
 	foreach ( (array) $wp_settings_sections[$page] as $section ) {
 		if ( $section['title'] )
-			echo "<h3>{$section['title']}</h3>\n";
+			echo "<h2>{$section['title']}</h2>\n";
 		if ( $section['callback'] )
 			call_user_func( $section['callback'], $section );
 		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
 * to the 'settings_errors' transient then those errors will be returned instead. This
 * is used to pass errors back across pageloads.
 *
 * Use the $sanitize argument to manually re-sanitize the option before returning errors.
 * This is useful if you have errors or notices you want to show even when the user
-* hasn't submitted data (i.e. when they first load an options page, or in admin_notices action hook)
+* hasn't submitted data (i.e. when they first load an options page, or in the {@see 'admin_notices'}
+* action hook).
 *
 * @since 3.0.0
 *
 * @global array $wp_settings_errors Storage array of errors registered during this pageload
 *
 		$wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
 		delete_transient( 'settings_errors' );
 	}
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
+	if ( empty( $wp_settings_errors ) ) {
 		return array();
+	}
 	// Filter the results to those of a specific setting if one was set.
 	if ( $setting ) {
 		$setting_errors = array();
 		foreach ( (array) $wp_settings_errors as $key => $details ) {
 	return $wp_settings_errors;
 }
 /**
-* Display settings errors registered by {@see add_settings_error()}.
+* Display settings errors registered by add_settings_error().
 *
 * Part of the Settings API. Outputs a div for each error retrieved by
-* {@see get_settings_errors()}.
+* get_settings_errors().
 *
 * This is called automatically after a settings page based on the
 * Settings API is submitted. Errors should be added during the validation
-* callback function for a setting defined in {@see register_setting()}
+* callback function for a setting defined in register_setting().
 *
-* The $sanitize option is passed into {@see get_settings_errors()} and will
+* The $sanitize option is passed into get_settings_errors() and will
 * re-run the setting sanitization
 * on its current value.
 *
 * The $hide_on_update option will cause errors to only show when the settings
 * page is first loaded. if the user has already saved new values it will be
 * reporting after submission. This is useful to show general errors like
 * missing settings when the user arrives at the settings page.
 *
 * @since 3.0.0
 *
-* @param string $setting Optional slug title of a specific setting who's errors you want.
+* @param string $setting        Optional slug title of a specific setting who's errors you want.
-* @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
+* @param bool   $sanitize       Whether to re-sanitize the setting value before returning errors.
-* @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
+* @param bool   $hide_on_update If set to true errors will not be shown if the settings page has
+*                               already been submitted.
 */
 function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
 		return;
 	}
 	echo $output;
 }
 /**
-* {@internal Missing Short Description}}
+* Outputs the modal window used for attaching media to posts or pages in the media-listing screen.
 *
 * @since 2.7.0
 *
 * @param string $found_action
 */
 function find_posts_div($found_action = '') {
 ?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
-			<?php _e( 'Find Posts or Pages' ); ?>
+			<?php _e( 'Attach to existing content' ); ?>
-			<div id="find-posts-close"></div>
+			<button type="button" id="find-posts-close"><span class="screen-reader-text"><?php _e( 'Close media attachment panel' ); ?></span></button>
 		</div>
 		<div class="find-box-inside">
 			<div class="find-box-search">
 				<?php if ( $found_action ) { ?>
 					<input type="hidden" name="found_action" value="<?php echo esc_attr($found_action); ?>" />
 				<div class="clear"></div>
 			</div>
 			<div id="find-posts-response"></div>
 		</div>
 		<div class="find-box-buttons">
-			<?php submit_button( __( 'Select' ), 'button-primary alignright', 'find-posts-submit', false ); ?>
+			<?php submit_button( __( 'Select' ), 'primary alignright', 'find-posts-submit', false ); ?>
 			<div class="clear"></div>
 		</div>
 	</div>
 <?php
 }
 /**
-* Display the post password.
+* Displays the post password.
 *
-* The password is passed through {@link esc_attr()} to ensure that it
+* The password is passed through esc_attr() to ensure that it is safe for placing in an html attribute.
-* is safe for placing in an html attribute.
 *
 * @since 2.7.0
 */
 function the_post_password() {
 	$post = get_post();
 		$title = __( '(no title)' );
 	return esc_html( $title );
 }
 /**
-* Display the search query.
+* Displays the search query.
 *
-* A simple wrapper to display the "s" parameter in a GET URI. This function
+* A simple wrapper to display the "s" parameter in a `GET` URI. This function
-* should only be used when {@link the_search_query()} cannot.
+* should only be used when the_search_query() cannot.
 *
 * @since 2.7.0
 */
 function _admin_search_query() {
 	echo isset($_REQUEST['s']) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
 /**
 * Generic Iframe header for use with Thickbox
 *
 * @since 2.7.0
+*
+* @global string    $hook_suffix
+* @global string    $admin_body_class
+* @global WP_Locale $wp_locale
 *
 * @param string $title      Optional. Title of the Iframe page. Default empty.
 * @param bool   $deprecated Not used.
 */
 function iframe_header( $title = '', $deprecated = false ) {
 do_action( "admin_head-$hook_suffix" );
 /** This action is documented in wp-admin/admin-header.php */
 do_action( 'admin_head' );
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 if ( is_rtl() )
 	$admin_body_class .= ' rtl';
 ?>
 </head>
 <?php
 /** This filter is documented in wp-admin/admin-header.php */
 $admin_body_classes = apply_filters( 'admin_body_class', '' );
 ?>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body<?php
+/**
+* @global string $body_id
+*/
+if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
 c = c.replace(/no-js/, 'js');
 document.body.className = c;
 	/*
 	 * We're going to hide any footer output on iFrame pages,
 	 * but run the hooks anyway since they output JavaScript
 	 * or other needed content.
 	 */
-	 ?>
+	/**
+	 * @global string $hook_suffix
+	 */
+	global $hook_suffix;
+	?>
 	<div class="hidden">
 <?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer', '' );
+	do_action( 'admin_footer', $hook_suffix );
+	/** This action is documented in wp-admin/admin-footer.php */
+	do_action( "admin_print_footer_scripts-$hook_suffix" );
 	/** This action is documented in wp-admin/admin-footer.php */
 	do_action( 'admin_print_footer_scripts' );
 ?>
 	</div>
 </body>
 </html>
 <?php
 }
+/**
+*
+* @param WP_Post $post
+*/
 function _post_states($post) {
 	$post_states = array();
 	if ( isset( $_REQUEST['post_status'] ) )
 		$post_status = $_REQUEST['post_status'];
 	else
 	if ( !empty($post->post_password) )
 		$post_states['protected'] = __('Password protected');
 	if ( 'private' == $post->post_status && 'private' != $post_status )
 		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
+	if ( 'draft' === $post->post_status ) {
-		$post_states['draft'] = __('Draft');
+		if ( get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) {
+			$post_states[] = __( 'Customization Draft' );
+		} elseif ( 'draft' !== $post_status ) {
+			$post_states['draft'] = __( 'Draft' );
+		}
+	} elseif ( 'trash' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) {
+		$post_states[] = __( 'Customization Draft' );
+	}
 	if ( 'pending' == $post->post_status && 'pending' != $post_status )
-		/* translators: post state */
+		$post_states['pending'] = _x('Pending', 'post status');
-		$post_states['pending'] = _x('Pending', 'post state');
 	if ( is_sticky($post->ID) )
 		$post_states['sticky'] = __('Sticky');
-	if ( get_option( 'page_on_front' ) == $post->ID ) {
+	if ( 'future' === $post->post_status ) {
-		$post_states['page_on_front'] = __( 'Front Page' );
+		$post_states['scheduled'] = __( 'Scheduled' );
 	}
-	if ( get_option( 'page_for_posts' ) == $post->ID ) {
+	if ( 'page' === get_option( 'show_on_front' ) ) {
-		$post_states['page_for_posts'] = __( 'Posts Page' );
+		if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) {
+			$post_states['page_on_front'] = __( 'Front Page' );
+		}
+		if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
+			$post_states['page_for_posts'] = __( 'Posts Page' );
+		}
+	}
+	if ( intval( get_option( 'wp_page_for_privacy_policy' ) ) === $post->ID ) {
+		$post_states['page_for_privacy_policy'] = __( 'Privacy Policy Page' );
 	}
 	/**
-	 * Filter the default post display states used in the posts list table.
+	 * Filters the default post display states used in the posts list table.
 	 *
 	 * @since 2.8.0
+	 * @since 3.6.0 Added the `$post` parameter.
 	 *
-	 * @param array $post_states An array of post display states.
+	 * @param array   $post_states An array of post display states.
-	 * @param int   $post        The post ID.
+	 * @param WP_Post $post        The current post object.
 	 */
 	$post_states = apply_filters( 'display_post_states', $post_states, $post );
 	if ( ! empty($post_states) ) {
 		$state_count = count($post_states);
 		$i = 0;
-		echo ' - ';
+		echo ' &mdash; ';
 		foreach ( $post_states as $state ) {
 			++$i;
 			( $i == $state_count ) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
 }
+/**
+*
+* @param WP_Post $post
+*/
 function _media_states( $post ) {
 	$media_states = array();
 	$stylesheet = get_option('stylesheet');
 	if ( current_theme_supports( 'custom-header') ) {
 		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
-		if ( ! empty( $meta_header ) && $meta_header == $stylesheet )
-			$media_states[] = __( 'Header Image' );
+		if ( is_random_header_image() ) {
+			$header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
+			if ( $meta_header == $stylesheet && in_array( $post->ID, $header_images ) ) {
+				$media_states[] = __( 'Header Image' );
+			}
+		} else {
+			$header_image = get_header_image();
+			// Display "Header Image" if the image was ever used as a header image
+			if ( ! empty( $meta_header ) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url( $post->ID ) ) {
+				$media_states[] = __( 'Header Image' );
+			}
+			// Display "Current Header Image" if the image is currently the header image
+			if ( $header_image && $header_image == wp_get_attachment_url( $post->ID ) ) {
+				$media_states[] = __( 'Current Header Image' );
+			}
+		}
 	}
 	if ( current_theme_supports( 'custom-background') ) {
 		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
-		if ( ! empty( $meta_background ) && $meta_background == $stylesheet )
+		if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
 			$media_states[] = __( 'Background Image' );
+			$background_image = get_background_image();
+			if ( $background_image && $background_image == wp_get_attachment_url( $post->ID ) ) {
+				$media_states[] = __( 'Current Background Image' );
+			}
+		}
+	}
+	if ( $post->ID == get_option( 'site_icon' ) ) {
+		$media_states[] = __( 'Site Icon' );
+	}
+	if ( $post->ID == get_theme_mod( 'custom_logo' ) ) {
+		$media_states[] = __( 'Logo' );
 	}
 	/**
-	 * Filter the default media display states for items in the Media list table.
+	 * Filters the default media display states for items in the Media list table.
 	 *
 	 * @since 3.2.0
+	 * @since 4.8.0 Added the `$post` parameter.
 	 *
-	 * @param array $media_states An array of media states. Default 'Header Image',
+	 * @param array   $media_states An array of media states. Default 'Header Image',
-	 *                            'Background Image'.
+	 *                              'Background Image', 'Site Icon', 'Logo'.
+	 * @param WP_Post $post         The current attachment object.
 	 */
-	$media_states = apply_filters( 'display_media_states', $media_states );
+	$media_states = apply_filters( 'display_media_states', $media_states, $post );
 	if ( ! empty( $media_states ) ) {
 		$state_count = count( $media_states );
 		$i = 0;
-		echo ' - ';
+		echo ' &mdash; ';
 		foreach ( $media_states as $state ) {
 			++$i;
 			( $i == $state_count ) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 * @since 2.8.0
 */
 function compression_test() {
 ?>
 	<script type="text/javascript">
+	var compressionNonce = <?php echo wp_json_encode( wp_create_nonce( 'update_can_compress_scripts' ) ); ?>;
 	var testCompression = {
 		get : function(test) {
 			var x;
 			if ( window.XMLHttpRequest ) {
 				x = new XMLHttpRequest();
 						h = x.getResponseHeader('Content-Encoding');
 						testCompression.check(r, h, test);
 					}
 				};
-				x.open('GET', ajaxurl + '?action=wp-compression-test&test='+test+'&'+(new Date()).getTime(), true);
+				x.open('GET', ajaxurl + '?action=wp-compression-test&test='+test+'&_ajax_nonce='+compressionNonce+'&'+(new Date()).getTime(), true);
 				x.send('');
 			}
 		},
 		check : function(r, h, test) {
 *
 * @see get_submit_button()
 *
 * @param string       $text             The text of the button (defaults to 'Save Changes')
 * @param string       $type             Optional. The type and CSS class(es) of the button. Core values
-*                                       include 'primary', 'secondary', 'delete'. Default 'primary'
+*                                       include 'primary', 'small', and 'large'. Default 'primary'.
 * @param string       $name             The HTML name of the submit button. Defaults to "submit". If no
 *                                       id attribute is given in $other_attributes below, $name will be
 *                                       used as the button's id.
 * @param bool         $wrap             True if the output button should be wrapped in a paragraph tag,
 *                                       false otherwise. Defaults to true
 * Returns a submit button, with provided text and appropriate class
 *
 * @since 3.1.0
 *
 * @param string       $text             Optional. The text of the button. Default 'Save Changes'.
-* @param string       $type             Optional. The type of button. Accepts 'primary', 'secondary',
+* @param string       $type             Optional. The type and CSS class(es) of the button. Core values
-*                                       or 'delete'. Default 'primary large'.
+*                                       include 'primary', 'small', and 'large'. Default 'primary large'.
 * @param string       $name             Optional. The HTML name of the submit button. Defaults to "submit".
 *                                       If no id attribute is given in $other_attributes below, `$name` will
 *                                       be used as the button's id. Default 'submit'.
 * @param bool         $wrap             Optional. True if the output button should be wrapped in a paragraph
 *                                       tag, false otherwise. Default true.
 	foreach ( $type as $t ) {
 		if ( 'secondary' === $t || 'button-secondary' === $t )
 			continue;
 		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
 	}
-	$class = implode( ' ', array_unique( $classes ) );
+	// Remove empty items, remove duplicate items, and finally build a string.
+	$class = implode( ' ', array_unique( array_filter( $classes ) ) );
-	if ( 'delete' === $type )
-		$class = 'button-secondary delete';
 	$text = $text ? $text : __( 'Save Changes' );
 	// Default the id attribute to $name unless an id was specifically provided in $other_attributes
 	$id = $name;
 	}
 	return $button;
 }
+/**
+*
+* @global bool $is_IE
+*/
 function _wp_admin_html_begin() {
 	global $is_IE;
 	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <?php
 }
-final class WP_Internal_Pointers {
-	/**
-	 * Initializes the new feature pointers.
-	 *
-	 * @since 3.3.0
-	 *
-	 * All pointers can be disabled using the following:
-	 *     remove_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
-	 *
-	 * Individual pointers (e.g. wp390_widgets) can be disabled using the following:
-	 *     remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp390_widgets' ) );
-	 *
-	 * @param string $hook_suffix The current admin page.
-	 */
-	public static function enqueue_scripts( $hook_suffix ) {
-		/*
-		 * Register feature pointers
-		 * Format: array( hook_suffix => pointer_id )
-		 */
-		$registered_pointers = array(
-			'post-new.php' => 'wp410_dfw',
-			'post.php'     => 'wp410_dfw',
-			'edit.php'     => 'wp360_locks',
-			'widgets.php'  => 'wp390_widgets',
-			'themes.php'   => 'wp390_widgets',
-		);
-		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
-			return;
-		$pointers = (array) $registered_pointers[ $hook_suffix ];
-		$caps_required = array(
-			'wp390_widgets' => array( 'edit_theme_options' ),
-		);
-		// Get dismissed pointers
-		$dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
-		$got_pointers = false;
-		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
-			if ( isset( $caps_required[ $pointer ] ) ) {
-				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
-						continue 2;
-				}
-			}
-			// Bind pointer print function
-			add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
-			$got_pointers = true;
-		}
-		if ( ! $got_pointers )
-			return;
-		// Add pointers script and style to queue
-		wp_enqueue_style( 'wp-pointer' );
-		wp_enqueue_script( 'wp-pointer' );
-	}
-	/**
-	 * Print the pointer JavaScript data.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param string $pointer_id The pointer ID.
-	 * @param string $selector The HTML elements, on which the pointer should be attached.
-	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
-	 */
-	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
-			return;
-		?>
-		<script type="text/javascript">
-		(function($){
-			var options = <?php echo wp_json_encode( $args ); ?>, setup;
-			if ( ! options )
-				return;
-			options = $.extend( options, {
-				close: function() {
-					$.post( ajaxurl, {
-						pointer: '<?php echo $pointer_id; ?>',
-						action: 'dismiss-wp-pointer'
-					});
-				}
-			});
-			setup = function() {
-				$('<?php echo $selector; ?>').first().pointer( options ).pointer('open');
-			};
-			if ( options.position && options.position.defer_loading )
-				$(window).bind( 'load.wp-pointers', setup );
-			else
-				$(document).ready( setup );
-		})( jQuery );
-		</script>
-		<?php
-	}
-	public static function pointer_wp330_toolbar() {}
-	public static function pointer_wp330_media_uploader() {}
-	public static function pointer_wp330_saving_widgets() {}
-	public static function pointer_wp340_customize_current_theme_link() {}
-	public static function pointer_wp340_choose_image_from_library() {}
-	public static function pointer_wp350_media() {}
-	public static function pointer_wp360_revisions() {}
-	public static function pointer_wp360_locks() {
-		if ( ! is_multi_author() ) {
-			return;
-		}
-		$content  = '<h3>' . __( 'Edit Lock' ) . '</h3>';
-		$content .= '<p>' . __( 'Someone else is editing this. No need to refresh; the lock will disappear when they&#8217;re done.' ) . '</p>';
-		self::print_js( 'wp360_locks', 'tr.wp-locked .locked-indicator', array(
-			'content' => $content,
-			'position' => array( 'edge' => 'left', 'align' => 'left' ),
-		) );
-	}
-	public static function pointer_wp390_widgets() {
-		if ( ! current_theme_supports( 'widgets' ) ) {
-			return;
-		}
-		$content  = '<h3>' . __( 'New Feature: Live Widget Previews' ) . '</h3>';
-		$content .= '<p>' . __( 'Add, edit, and play around with your widgets from the Customizer.' ) . ' ' . __( 'Preview your changes in real-time and only save them when you&#8217;re ready.' ) . '</p>';
-		if ( 'themes' === get_current_screen()->id ) {
-			$selector = '.theme.active .customize';
-			$position = array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'center' );
-		} else {
-			$selector = 'a[href^="customize.php"]';
-			if ( is_rtl() ) {
-				$position = array( 'edge' => 'right', 'align' => 'center', 'my' => 'right-5px' );
-			} else {
-				$position = array( 'edge' => 'left', 'align' => 'center', 'my' => 'left-5px' );
-			}
-		}
-		self::print_js( 'wp390_widgets', $selector, array(
-			'content' => $content,
-			'position' => $position,
-		) );
-	}
-	public static function pointer_wp410_dfw() {
-		// Don't show when editor-scrolling is not used.
-		if ( empty( $GLOBALS['_wp_editor_expand'] ) ) {
-			return;
-		}
-		$content  = '<h3>' . __( 'Distraction-Free Writing' ) . '</h3>';
-		$content .= '<p>' . __( 'Enable distraction-free writing mode, and everything surrounding the editor will fade away when you start typing. Move your mouse out of the editor to reveal everything again.' ) . '</p>';
-		if ( is_rtl() ) {
-			$position = array( 'edge' => 'left', 'align' => 'center', 'my' => 'left+40 top-11', 'at' => 'left top' );
-		} else {
-			$position = array( 'edge' => 'right', 'align' => 'center', 'my' => 'right-40 top-11', 'at' => 'right top' );
-		}
-		self::print_js( 'wp410_dfw', '#wp-content-wrap', array(
-			'content' => $content,
-			'position' => $position,
-		) );
-	}
-	/**
-	 * Prevents new users from seeing existing 'new feature' pointers.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $user_id User ID.
-	 */
-	public static function dismiss_pointers_for_new_users( $user_id ) {
-		add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp360_locks,wp390_widgets' );
-	}
-}
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
 /**
 * Convert a screen string to a screen object
 *
 * @since 3.0.0
 *
 * @param string $hook_name The hook name (also known as the hook suffix) used to determine the screen.
 * @return WP_Screen Screen object.
 */
 function convert_to_screen( $hook_name ) {
 	if ( ! class_exists( 'WP_Screen' ) ) {
-		_doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3' );
+		_doing_it_wrong(
+			'convert_to_screen(), add_meta_box()',
+			sprintf(
+				/* translators: 1: wp-admin/includes/template.php 2: add_meta_box() 3: add_meta_boxes */
+				__( 'Likely direct inclusion of %1$s in order to use %2$s. This is very wrong. Hook the %2$s call into the %3$s action instead.' ),
+				'<code>wp-admin/includes/template.php</code>',
+				'<code>add_meta_box()</code>',
+				'<code>add_meta_boxes</code>'
+			),
+			'3.3.0'
+		);
 		return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );
 	}
 	return WP_Screen::get( $hook_name );
 }
 * @since 3.6.0
 * @access private
 */
 function _local_storage_notice() {
 	?>
-	<div id="local-storage-notice" class="hidden notice">
+	<div id="local-storage-notice" class="hidden notice is-dismissible">
 	<p class="local-restore">
-		<?php _e('The backup of this post in your browser is different from the version below.'); ?>
+		<?php _e( 'The backup of this post in your browser is different from the version below.' ); ?>
-		<a class="restore-backup" href="#"><?php _e('Restore the backup.'); ?></a>
+		<button type="button" class="button restore-backup"><?php _e('Restore the backup'); ?></button>
 	</p>
-	<p class="undo-restore hidden">
+	<p class="help">
-		<?php _e('Post restored successfully.'); ?>
+		<?php _e( 'This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.' ); ?>
-		<a class="undo-restore-backup" href="#"><?php _e('Undo.'); ?></a>
 	</p>
 	</div>
 	<?php
 }
 * Outputs a HTML element with the star rating exposed on a 0..5 scale in
 * half star increments (ie. 1, 1.5, 2 stars). Optionally, if specified, the
 * number of ratings may also be displayed by passing the $number parameter.
 *
 * @since 3.8.0
+* @since 4.4.0 Introduced the `echo` parameter.
+*
 * @param array $args {
 *     Optional. Array of star ratings arguments.
 *
-*     @type int    $rating The rating to display, expressed in either a 0.5 rating increment,
+*     @type int|float $rating The rating to display, expressed in either a 0.5 rating increment,
-*                          or percentage. Default 0.
+*                             or percentage. Default 0.
-*     @type string $type   Format that the $rating is in. Valid values are 'rating' (default),
+*     @type string    $type   Format that the $rating is in. Valid values are 'rating' (default),
-*                          or, 'percent'. Default 'rating'.
+*                             or, 'percent'. Default 'rating'.
-*     @type int    $number The number of ratings that makes up this rating. Default 0.
+*     @type int       $number The number of ratings that makes up this rating. Default 0.
+*     @type bool      $echo   Whether to echo the generated markup. False to return the markup instead
+*                             of echoing it. Default true.
 * }
+* @return string Star rating HTML.
 */
 function wp_star_rating( $args = array() ) {
 	$defaults = array(
 		'rating' => 0,
-		'type' => 'rating',
+		'type'   => 'rating',
 		'number' => 0,
+		'echo'   => true,
 	);
 	$r = wp_parse_args( $args, $defaults );
-	// Non-english decimal places when the $rating is coming from a string
+	// Non-English decimal places when the $rating is coming from a string
-	$rating = str_replace( ',', '.', $r['rating'] );
+	$rating = (float) str_replace( ',', '.', $r['rating'] );
 	// Convert Percentage to star rating, 0..5 in .5 increments
-	if ( 'percent' == $r['type'] ) {
+	if ( 'percent' === $r['type'] ) {
 		$rating = round( $rating / 10, 0 ) / 2;
 	}
 	// Calculate the number of each type of star needed
 	$full_stars = floor( $rating );
 	} else {
 		/* translators: 1: The rating */
 		$title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
 	}
-	echo '<div class="star-rating" title="' . esc_attr( $title ) . '">';
+	$output = '<div class="star-rating">';
-	echo '<span class="screen-reader-text">' . $title . '</span>';
+	$output .= '<span class="screen-reader-text">' . $title . '</span>';
-	echo str_repeat( '<div class="star star-full"></div>', $full_stars );
+	$output .= str_repeat( '<div class="star star-full" aria-hidden="true"></div>', $full_stars );
-	echo str_repeat( '<div class="star star-half"></div>', $half_stars );
+	$output .= str_repeat( '<div class="star star-half" aria-hidden="true"></div>', $half_stars );
-	echo str_repeat( '<div class="star star-empty"></div>', $empty_stars);
+	$output .= str_repeat( '<div class="star star-empty" aria-hidden="true"></div>', $empty_stars );
-	echo '</div>';
+	$output .= '</div>';
+	if ( $r['echo'] ) {
+		echo $output;
+	}
+	return $output;
 }
 /**
 * Output a notice when editing the page for posts (internal use only).
 *

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9