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

equal deleted inserted replaced

-:346c88efed21
+:5e2f62d02dcd
 /**
 * Retrieve the ID of the current item in the WordPress Loop.
 *
 * @since 2.1.0
-* @uses $post
+*
-*
+* @return int|bool The ID of the current item in the WordPress Loop. False if $post is not set.
-* @return int
 */
 function get_the_ID() {
-	return get_post()->ID;
+	$post = get_post();
+	return ! empty( $post ) ? $post->ID : false;
 }
 /**
 * Display or retrieve the current post title with optional content.
 *
 * esc_attr()} before it is passed to the user or displayed. The default
 * as with {@link the_title()}, is to display the title.
 *
 * @since 2.3.0
 *
-* @param string|array $args Optional. Override the defaults.
+* @param string|array $args {
+*     Title attribute arguments. Optional.
+*
+*     @type string  $before Markup to prepend to the title. Default empty.
+*     @type string  $after  Markup to append to the title. Default empty.
+*     @type bool    $echo   Whether to echo or return the title. Default true for echo.
+*     @type WP_Post $post   Current post object to retrieve the title for.
+* }
 * @return string|null Null on failure or display. String when echo is false.
 */
 function the_title_attribute( $args = '' ) {
-	$defaults = array('before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
+	$defaults = array( 'before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
-	$r = wp_parse_args($args, $defaults);
+	$r = wp_parse_args( $args, $defaults );
-	extract( $r, EXTR_SKIP );
+	$title = get_the_title( $r['post'] );
-	$title = get_the_title( $post );
+	if ( strlen( $title ) == 0 ) {
-	if ( strlen($title) == 0 )
 		return;
+	}
-	$title = $before . $title . $after;
-	$title = esc_attr(strip_tags($title));
+	$title = $r['before'] . $title . $r['after'];
+	$title = esc_attr( strip_tags( $title ) );
-	if ( $echo )
+	if ( $r['echo'] ) {
 		echo $title;
-	else
+	} else {
 		return $title;
+	}
 }
 /**
 * Retrieve post title.
 *
 * will be displayed before the post title. If the post is private, then
 * "Private" will be located before the post title.
 *
 * @since 0.71
 *
-* @param int|object $post Optional. Post ID or object.
+* @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
 * @return string
 */
 function get_the_title( $post = 0 ) {
 	$post = get_post( $post );
 	$title = isset( $post->post_title ) ? $post->post_title : '';
 	$id = isset( $post->ID ) ? $post->ID : 0;
 	if ( ! is_admin() ) {
 		if ( ! empty( $post->post_password ) ) {
-			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ) );
+			/**
+			 * Filter the text prepended to the post title for protected posts.
+			 *
+			 * The filter is only applied on the front end.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @param string  $prepend Text displayed before the post title.
+			 *                         Default 'Protected: %s'.
+			 * @param WP_Post $post    Current post object.
+			 */
+			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
 			$title = sprintf( $protected_title_format, $title );
-		} else if ( isset( $post->post_status ) && 'private' == $post->post_status ) {
+		} elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
-			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ) );
+			/**
+			 * Filter the text prepended to the post title of private posts.
+			 *
+			 * The filter is only applied on the front end.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @param string  $prepend Text displayed before the post title.
+			 *                         Default 'Private: %s'.
+			 * @param WP_Post $post    Current post object.
+			 */
+			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post );
 			$title = sprintf( $private_title_format, $title );
 		}
 	}
+	/**
+	 * Filter the post title.
+	 *
+	 * @since 0.71
+	 *
+	 * @param string $title The post title.
+	 * @param int    $id    The post ID.
+	 */
 	return apply_filters( 'the_title', $title, $id );
 }
 /**
 * Display the Post Global Unique Identifier (guid).
 *
 * Url is escaped to make it xml safe
 *
 * @since 1.5.0
 *
-* @param int $id Optional. Post ID.
+* @param int|WP_Post $id Optional. Post ID or post object.
 */
 function the_guid( $id = 0 ) {
-	echo esc_url( get_the_guid( $id ) );
+	/**
+	 * Filter the escaped Global Unique Identifier (guid) of the post.
+	 *
+	 * @since 4.2.0
+	 *
+	 * @see get_the_guid()
+	 *
+	 * @param string $post_guid Escaped Global Unique Identifier (guid) of the post.
+	 */
+	echo apply_filters( 'the_guid', get_the_guid( $id ) );
 }
 /**
 * Retrieve the Post Global Unique Identifier (guid).
 *
 * post. The reason you should not use it as a link, is because of moving the
 * blog across domains.
 *
 * @since 1.5.0
 *
-* @param int $id Optional. Post ID.
+* @param int|WP_Post $id Optional. Post ID or post object.
 * @return string
 */
 function get_the_guid( $id = 0 ) {
 	$post = get_post($id);
-	return apply_filters('get_the_guid', $post->guid);
+	/**
+	 * Filter the Global Unique Identifier (guid) of the post.
+	 *
+	 * @since 1.5.0
+	 *
+	 * @param string $post_guid Global Unique Identifier (guid) of the post.
+	 */
+	return apply_filters( 'get_the_guid', $post->guid );
 }
 /**
 * Display the post content.
 *
 * @since 0.71
 *
 * @param string $more_link_text Optional. Content for when there is more text.
-* @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
+* @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
 */
 function the_content( $more_link_text = null, $strip_teaser = false) {
 	$content = get_the_content( $more_link_text, $strip_teaser );
+	/**
+	 * Filter the post content.
+	 *
+	 * @since 0.71
+	 *
+	 * @param string $content Content of the current post.
+	 */
 	$content = apply_filters( 'the_content', $content );
 	$content = str_replace( ']]>', ']]&gt;', $content );
 	echo $content;
 }
 * Retrieve the post content.
 *
 * @since 0.71
 *
 * @param string $more_link_text Optional. Content for when there is more text.
-* @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false.
+* @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
 * @return string
 */
 function get_the_content( $more_link_text = null, $strip_teaser = false ) {
 	global $page, $more, $preview, $pages, $multipage;
 	if ( count( $content ) > 1 ) {
 		if ( $more ) {
 			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
 			if ( ! empty( $more_link_text ) )
+				/**
+				 * Filter the Read More link text.
+				 *
+				 * @since 2.8.0
+				 *
+				 * @param string $more_link_element Read More link element.
+				 * @param string $more_link_text    Read More text.
+				 */
 				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
 			$output = force_balance_tags( $output );
 		}
 	}
-	if ( $preview ) // preview fix for javascript bug with foreign languages
+	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
 		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
 	return $output;
 }
 /**
-* Preview fix for javascript bug with foreign languages
+* Preview fix for JavaScript bug with foreign languages.
 *
 * @since 3.1.0
 * @access private
 * @param array $match Match array from preg_replace_callback
 * @return string
 /**
 * Display the post excerpt.
 *
 * @since 0.71
-* @uses apply_filters() Calls 'the_excerpt' hook on post excerpt.
 */
 function the_excerpt() {
-	echo apply_filters('the_excerpt', get_the_excerpt());
+	/**
+	 * Filter the displayed post excerpt.
+	 *
+	 * @since 0.71
+	 *
+	 * @see get_the_excerpt()
+	 *
+	 * @param string $post_excerpt The post excerpt.
+	 */
+	echo apply_filters( 'the_excerpt', get_the_excerpt() );
 }
 /**
 * Retrieve the post excerpt.
 *
 function get_the_excerpt( $deprecated = '' ) {
 	if ( !empty( $deprecated ) )
 		_deprecated_argument( __FUNCTION__, '2.3' );
 	$post = get_post();
+	if ( empty( $post ) ) {
+		return '';
+	}
 	if ( post_password_required() ) {
 		return __( 'There is no excerpt because this is a protected post.' );
 	}
+	/**
+	 * Filter the retrieved post excerpt.
+	 *
+	 * @since 1.2.0
+	 *
+	 * @param string $post_excerpt The post excerpt.
+	 */
 	return apply_filters( 'get_the_excerpt', $post->post_excerpt );
 }
 /**
 * Whether post has excerpt.
 *
 * @since 2.3.0
 *
-* @param int $id Optional. Post ID.
+* @param int|WP_Post $id Optional. Post ID or post object.
 * @return bool
 */
 function has_excerpt( $id = 0 ) {
 	$post = get_post( $id );
 	return ( !empty( $post->post_excerpt ) );
 * Display the classes for the post div.
 *
 * @since 2.7.0
 *
 * @param string|array $class One or more classes to add to the class list.
-* @param int $post_id An optional post ID.
+* @param int|WP_Post $post_id Optional. Post ID or post object.
 */
 function post_class( $class = '', $post_id = null ) {
 	// Separates classes with a single space, collates classes for post DIV
 	echo 'class="' . join( ' ', get_post_class( $class, $post_id ) ) . '"';
 }
 /**
 * Retrieve the classes for the post div as an array.
 *
-* The class names are add are many. If the post is a sticky, then the 'sticky'
+* The class names are many. If the post is a sticky, then the 'sticky'
-* class name. The class 'hentry' is always added to each post. For each
+* class name. The class 'hentry' is always added to each post. If the post has a
-* category, the class will be added with 'category-' with category slug is
+* post thumbnail, 'has-post-thumbnail' is added as a class. For each taxonomy that
-* added. The tags are the same way as the categories with 'tag-' before the tag
+* the post belongs to, a class will be added of the format '{$taxonomy}-{$slug}' -
-* slug. All classes are passed through the filter, 'post_class' with the list
+* eg 'category-foo' or 'my_custom_taxonomy-bar'. The 'post_tag' taxonomy is a special
-* of classes, followed by $class parameter value, with the post ID as the last
+* case; the class has the 'tag-' prefix instead of 'post_tag-'. All classes are
-* parameter.
+* passed through the filter, 'post_class' with the list of classes, followed by
+* $class parameter value, with the post ID as the last parameter.
 *
 * @since 2.7.0
-*
+* @since 4.2.0 Custom taxonomy classes were added.
-* @param string|array $class One or more classes to add to the class list.
+*
-* @param int $post_id An optional post ID.
+* @param string|array $class   One or more classes to add to the class list.
+* @param int|WP_Post  $post_id Optional. Post ID or post object.
 * @return array Array of classes.
 */
 function get_post_class( $class = '', $post_id = null ) {
-	$post = get_post($post_id);
+	$post = get_post( $post_id );
 	$classes = array();
-	if ( empty($post) )
+	if ( $class ) {
+		if ( ! is_array( $class ) ) {
+			$class = preg_split( '#\s+#', $class );
+		}
+		$classes = array_map( 'esc_attr', $class );
+	}
+	if ( ! $post ) {
 		return $classes;
+	}
 	$classes[] = 'post-' . $post->ID;
 	if ( ! is_admin() )
 		$classes[] = $post->post_type;
 	$classes[] = 'type-' . $post->post_type;
 			$classes[] = 'format-' . sanitize_html_class( $post_format );
 		else
 			$classes[] = 'format-standard';
 	}
-	// post requires password
+	// Post requires password
-	if ( post_password_required($post->ID) )
+	if ( post_password_required( $post->ID ) ) {
 		$classes[] = 'post-password-required';
+	// Post thumbnails
+	} elseif ( ! is_attachment( $post ) && current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) ) {
+		$classes[] = 'has-post-thumbnail';
+	}
 	// sticky for Sticky Posts
-	if ( is_sticky($post->ID) && is_home() && !is_paged() )
+	if ( is_sticky( $post->ID ) ) {
-		$classes[] = 'sticky';
+		if ( is_home() && ! is_paged() ) {
+			$classes[] = 'sticky';
+		} elseif ( is_admin() ) {
+			$classes[] = 'status-sticky';
+		}
+	}
 	// hentry for hAtom compliance
 	$classes[] = 'hentry';
-	// Categories
+	// All public taxonomies
-	if ( is_object_in_taxonomy( $post->post_type, 'category' ) ) {
+	$taxonomies = get_taxonomies( array( 'public' => true ) );
-		foreach ( (array) get_the_category($post->ID) as $cat ) {
+	foreach ( (array) $taxonomies as $taxonomy ) {
-			if ( empty($cat->slug ) )
+		if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
-				continue;
+			foreach ( (array) get_the_terms( $post->ID, $taxonomy ) as $term ) {
-			$classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id);
+				if ( empty( $term->slug ) ) {
-		}
+					continue;
-	}
+				}
-	// Tags
+				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-	if ( is_object_in_taxonomy( $post->post_type, 'post_tag' ) ) {
+				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
-		foreach ( (array) get_the_tags($post->ID) as $tag ) {
+					$term_class = $term->term_id;
-			if ( empty($tag->slug ) )
+				}
-				continue;
-			$classes[] = 'tag-' . sanitize_html_class($tag->slug, $tag->term_id);
+				// 'post_tag' uses the 'tag' prefix for backward compatibility.
-		}
+				if ( 'post_tag' == $taxonomy ) {
-	}
+					$classes[] = 'tag-' . $term_class;
+				} else {
-	if ( !empty($class) ) {
+					$classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
-		if ( !is_array( $class ) )
+				}
-			$class = preg_split('#\s+#', $class);
+			}
-		$classes = array_merge($classes, $class);
+		}
 	}
-	$classes = array_map('esc_attr', $classes);
+	$classes = array_map( 'esc_attr', $classes );
-	return apply_filters('post_class', $classes, $class, $post->ID);
+	/**
+	 * Filter the list of CSS classes for the current post.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param array  $classes An array of post classes.
+	 * @param string $class   A comma-separated list of additional classes added to the post.
+	 * @param int    $post_id The post ID.
+	 */
+	$classes = apply_filters( 'post_class', $classes, $class, $post->ID );
+	return array_unique( $classes );
 }
 /**
 * Display the classes for the body element.
 *
 			$classes[] = 'post-type-archive';
 			$post_type = get_query_var( 'post_type' );
 			if ( is_array( $post_type ) )
 				$post_type = reset( $post_type );
 			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
-		} else if ( is_author() ) {
+		} elseif ( is_author() ) {
 			$author = $wp_query->get_queried_object();
 			$classes[] = 'author';
 			if ( isset( $author->user_nicename ) ) {
 				$classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
 				$classes[] = 'author-' . $author->ID;
 			}
 		} elseif ( is_category() ) {
 			$cat = $wp_query->get_queried_object();
 			$classes[] = 'category';
 			if ( isset( $cat->term_id ) ) {
-				$classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
+				$cat_class = sanitize_html_class( $cat->slug, $cat->term_id );
+				if ( is_numeric( $cat_class ) || ! trim( $cat_class, '-' ) ) {
+					$cat_class = $cat->term_id;
+				}
+				$classes[] = 'category-' . $cat_class;
 				$classes[] = 'category-' . $cat->term_id;
 			}
 		} elseif ( is_tag() ) {
-			$tags = $wp_query->get_queried_object();
+			$tag = $wp_query->get_queried_object();
 			$classes[] = 'tag';
-			if ( isset( $tags->term_id ) ) {
+			if ( isset( $tag->term_id ) ) {
-				$classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
+				$tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
-				$classes[] = 'tag-' . $tags->term_id;
+				if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) {
+					$tag_class = $tag->term_id;
+				}
+				$classes[] = 'tag-' . $tag_class;
+				$classes[] = 'tag-' . $tag->term_id;
 			}
 		} elseif ( is_tax() ) {
 			$term = $wp_query->get_queried_object();
 			if ( isset( $term->term_id ) ) {
+				$term_class = sanitize_html_class( $term->slug, $term->term_id );
+				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+					$term_class = $term->term_id;
+				}
 				$classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-				$classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id );
+				$classes[] = 'term-' . $term_class;
 				$classes[] = 'term-' . $term->term_id;
 			}
 		}
 	} elseif ( is_page() ) {
 		$classes[] = 'page';
 		$post = get_post($page_id);
 		$classes[] = 'page-id-' . $page_id;
-		if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status = 'publish' LIMIT 1", $page_id) ) )
+		if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) {
 			$classes[] = 'page-parent';
+		}
 		if ( $post->post_parent ) {
 			$classes[] = 'page-child';
 			$classes[] = 'parent-pageid-' . $post->post_parent;
 		}
 		if ( is_page_template() ) {
 			$classes[] = 'page-template';
-			$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_page_template_slug( $page_id ) ) );
+			$template_slug  = get_page_template_slug( $page_id );
+			$template_parts = explode( '/', $template_slug );
+			foreach ( $template_parts as $part ) {
+				$classes[] = 'page-template-' . sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) );
+			}
+			$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
 		} else {
 			$classes[] = 'page-template-default';
 		}
 	}
 	if ( is_admin_bar_showing() ) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
-	if ( get_theme_mod( 'background_color' ) || get_background_image() )
+	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
 		$classes[] = 'custom-background';
 	$page = $wp_query->get( 'page' );
-	if ( !$page || $page < 2)
+	if ( ! $page || $page < 2 )
 		$page = $wp_query->get( 'paged' );
-	if ( $page && $page > 1 ) {
+	if ( $page && $page > 1 && ! is_404() ) {
 		$classes[] = 'paged-' . $page;
 		if ( is_single() )
 			$classes[] = 'single-paged-' . $page;
 		elseif ( is_page() )
 		$class = array();
 	}
 	$classes = array_map( 'esc_attr', $classes );
-	return apply_filters( 'body_class', $classes, $class );
+	/**
+	 * Filter the list of CSS body classes for the current post or page.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param array  $classes An array of body classes.
+	 * @param string $class   A comma-separated list of additional classes added to the body.
+	 */
+	$classes = apply_filters( 'body_class', $classes, $class );
+	return array_unique( $classes );
 }
 /**
 * Whether post requires password and correct password has been provided.
 *
 		return false;
 	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
 		return true;
-	require_once ABSPATH . 'wp-includes/class-phpass.php';
+	require_once ABSPATH . WPINC . '/class-phpass.php';
 	$hasher = new PasswordHash( 8, true );
 	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
 	if ( 0 !== strpos( $hash, '$P$B' ) )
 		return true;
 	return ! $hasher->CheckPassword( $post->post_password, $hash );
 }
-/**
+//
-* Page Template Functions for usage in Themes
+// Page Template Functions for usage in Themes
-*
+//
-* @package WordPress
-* @subpackage Template
-*/
 /**
 * The formatted output of a list of pages.
 *
 * Displays page links for paginated posts (i.e. includes the <!--nextpage-->.
 * Quicktag one or more times). This tag must be within The Loop.
 *
-* The defaults for overwriting are:
-* 'before' - Default is '<p> Pages:' (string). The html or text to prepend to
-*      each bookmarks.
-* 'after' - Default is '</p>' (string). The html or text to append to each
-*      bookmarks.
-* 'link_before' - Default is '' (string). The html or text to prepend to each
-*      Pages link inside the <a> tag. Also prepended to the current item, which
-*      is not linked.
-* 'link_after' - Default is '' (string). The html or text to append to each
-*      Pages link inside the <a> tag. Also appended to the current item, which
-*      is not linked.
-* 'next_or_number' - Default is 'number' (string). Indicates whether page
-*      numbers should be used. Valid values are number and next.
-* 'separator' - Default is ' ' (string). Text used between pagination links.
-* 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page.
-*      of the bookmark.
-* 'previouspagelink' - Default is 'Previous Page' (string). Text for link to
-*      previous page, if available.
-* 'pagelink' - Default is '%' (String).Format string for page numbers. The % in
-*      the parameter string will be replaced with the page number, so Page %
-*      generates "Page 1", "Page 2", etc. Defaults to %, just the page number.
-* 'echo' - Default is 1 (integer). When not 0, this triggers the HTML to be
-*      echoed and then returned.
-*
 * @since 1.2.0
 *
-* @param string|array $args Optional. Overwrite the defaults.
+* @param string|array $args {
+*     Optional. Array or string of default arguments.
+*
+*     @type string       $before           HTML or text to prepend to each link. Default is `<p> Pages:`.
+*     @type string       $after            HTML or text to append to each link. Default is `</p>`.
+*     @type string       $link_before      HTML or text to prepend to each link, inside the `<a>` tag.
+*                                          Also prepended to the current item, which is not linked. Default empty.
+*     @type string       $link_after       HTML or text to append to each Pages link inside the `<a>` tag.
+*                                          Also appended to the current item, which is not linked. Default empty.
+*     @type string       $next_or_number   Indicates whether page numbers should be used. Valid values are number
+*                                          and next. Default is 'number'.
+*     @type string       $separator        Text between pagination links. Default is ' '.
+*     @type string       $nextpagelink     Link text for the next page link, if available. Default is 'Next Page'.
+*     @type string       $previouspagelink Link text for the previous page link, if available. Default is 'Previous Page'.
+*     @type string       $pagelink         Format string for page numbers. The % in the parameter string will be
+*                                          replaced with the page number, so 'Page %' generates "Page 1", "Page 2", etc.
+*                                          Defaults to '%', just the page number.
+*     @type int|bool     $echo             Whether to echo or not. Accepts 1|true or 0|false. Default 1|true.
+* }
 * @return string Formatted output in HTML.
 */
 function wp_link_pages( $args = '' ) {
 	$defaults = array(
 		'before'           => '<p>' . __( 'Pages:' ),
 		'previouspagelink' => __( 'Previous page' ),
 		'pagelink'         => '%',
 		'echo'             => 1
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$params = wp_parse_args( $args, $defaults );
-	$r = apply_filters( 'wp_link_pages_args', $r );
-	extract( $r, EXTR_SKIP );
+	/**
+	 * Filter the arguments used in retrieving page links for paginated posts.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param array $params An array of arguments for page links for paginated posts.
+	 */
+	$r = apply_filters( 'wp_link_pages_args', $params );
 	global $page, $numpages, $multipage, $more;
 	$output = '';
 	if ( $multipage ) {
-		if ( 'number' == $next_or_number ) {
+		if ( 'number' == $r['next_or_number'] ) {
-			$output .= $before;
+			$output .= $r['before'];
 			for ( $i = 1; $i <= $numpages; $i++ ) {
-				$link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after;
+				$link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
-				if ( $i != $page || ! $more && 1 == $page )
+				if ( $i != $page || ! $more && 1 == $page ) {
 					$link = _wp_link_page( $i ) . $link . '</a>';
+				}
+				/**
+				 * Filter the HTML output of individual page number links.
+				 *
+				 * @since 3.6.0
+				 *
+				 * @param string $link The page number HTML output.
+				 * @param int    $i    Page number for paginated posts' page links.
+				 */
 				$link = apply_filters( 'wp_link_pages_link', $link, $i );
-				$output .= $separator . $link;
+				// Use the custom links separator beginning with the second link.
+				$output .= ( 1 === $i ) ? ' ' : $r['separator'];
+				$output .= $link;
 			}
-			$output .= $after;
+			$output .= $r['after'];
 		} elseif ( $more ) {
-			$output .= $before;
+			$output .= $r['before'];
-			$i = $page - 1;
+			$prev = $page - 1;
-			if ( $i ) {
+			if ( $prev ) {
-				$link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '</a>';
+				$link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
-				$link = apply_filters( 'wp_link_pages_link', $link, $i );
-				$output .= $separator . $link;
+				/** This filter is documented in wp-includes/post-template.php */
+				$output .= apply_filters( 'wp_link_pages_link', $link, $prev );
 			}
-			$i = $page + 1;
+			$next = $page + 1;
-			if ( $i <= $numpages ) {
+			if ( $next <= $numpages ) {
-				$link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . '</a>';
+				if ( $prev ) {
-				$link = apply_filters( 'wp_link_pages_link', $link, $i );
+					$output .= $r['separator'];
-				$output .= $separator . $link;
+				}
+				$link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
+				/** This filter is documented in wp-includes/post-template.php */
+				$output .= apply_filters( 'wp_link_pages_link', $link, $next );
 			}
-			$output .= $after;
+			$output .= $r['after'];
 		}
 	}
-	$output = apply_filters( 'wp_link_pages', $output, $args );
+	/**
+	 * Filter the HTML output of page links for paginated posts.
-	if ( $echo )
+	 *
-		echo $output;
+	 * @since 3.6.0
+	 *
-	return $output;
+	 * @param string $output HTML output of paginated posts' page links.
+	 * @param array  $args   An array of arguments.
+	 */
+	$html = apply_filters( 'wp_link_pages', $output, $args );
+	if ( $r['echo'] ) {
+		echo $html;
+	}
+	return $html;
 }
 /**
 * Helper function for wp_link_pages().
 *
 			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
 		else
 			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
 	}
+	if ( is_preview() ) {
+		$url = add_query_arg( array(
+			'preview' => 'true'
+		), $url );
+		if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
+			$url = add_query_arg( array(
+				'preview_id'    => wp_unslash( $_GET['preview_id'] ),
+				'preview_nonce' => wp_unslash( $_GET['preview_nonce'] )
+			), $url );
+		}
+	}
 	return '<a href="' . esc_url( $url ) . '">';
 }
 //
 // Post-meta: Custom per-post fields.
 /**
 * Display list of post custom fields.
 *
 * @internal This will probably change at some point...
 * @since 1.2.0
-* @uses apply_filters() Calls 'the_meta_key' on list item HTML content, with key and value as separate parameters.
 */
 function the_meta() {
 	if ( $keys = get_post_custom_keys() ) {
 		echo "<ul class='post-meta'>\n";
 		foreach ( (array) $keys as $key ) {
 			$keyt = trim($key);
 			if ( is_protected_meta( $keyt, 'post' ) )
 				continue;
 			$values = array_map('trim', get_post_custom_values($key));
 			$value = implode($values,', ');
-			echo apply_filters('the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value);
+			/**
+			 * Filter the HTML output of the li element in the post custom fields list.
+			 *
+			 * @since 2.2.0
+			 *
+			 * @param string $html  The HTML output for the li element.
+			 * @param string $key   Meta key.
+			 * @param string $value Meta value.
+			 */
+			echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value );
 		}
 		echo "</ul>\n";
 	}
 }
 /**
 * Retrieve or display list of pages as a dropdown (select list).
 *
 * @since 2.1.0
-*
+* @since 4.2.0 The `$value_field` argument was added.
-* @param array|string $args Optional. Override default arguments.
+*
+* @param array|string $args {
+*     Optional. Array or string of arguments to generate a pages drop-down element.
+*
+*     @type int          $depth                 Maximum depth. Default 0.
+*     @type int          $child_of              Page ID to retrieve child pages of. Default 0.
+*     @type int|string   $selected              Value of the option that should be selected. Default 0.
+*     @type bool|int     $echo                  Whether to echo or return the generated markup. Accepts 0, 1,
+*                                               or their bool equivalents. Default 1.
+*     @type string       $name                  Value for the 'name' attribute of the select element.
+*                                               Default 'page_id'.
+*     @type string       $id                    Value for the 'id' attribute of the select element.
+*                                               Defaults to the value of `$name`.
+*     @type string       $show_option_none      Text to display for showing no pages. Default empty (does not display).
+*     @type string       $show_option_no_change Text to display for "no change" option. Default empty (does not display).
+*     @type string       $option_none_value     Value to use when no page is selected. Default empty.
+*     @type string       $value_field           Post field used to populate the 'value' attribute of the option
+*                                               elements. Accepts any valid post field. Default 'ID'.
+* }
 * @return string HTML content, if not displaying.
 */
-function wp_dropdown_pages($args = '') {
+function wp_dropdown_pages( $args = '' ) {
 	$defaults = array(
 		'depth' => 0, 'child_of' => 0,
 		'selected' => 0, 'echo' => 1,
 		'name' => 'page_id', 'id' => '',
 		'show_option_none' => '', 'show_option_no_change' => '',
-		'option_none_value' => ''
+		'option_none_value' => '',
+		'value_field' => 'ID',
 	);
 	$r = wp_parse_args( $args, $defaults );
-	extract( $r, EXTR_SKIP );
+	$pages = get_pages( $r );
-	$pages = get_pages($r);
 	$output = '';
 	// Back-compat with old system where both id and name were based on $name argument
-	if ( empty($id) )
+	if ( empty( $r['id'] ) ) {
-		$id = $name;
+		$r['id'] = $r['name'];
+	}
-	if ( ! empty($pages) ) {
-		$output = "<select name='" . esc_attr( $name ) . "' id='" . esc_attr( $id ) . "'>\n";
+	if ( ! empty( $pages ) ) {
-		if ( $show_option_no_change )
+		$output = "<select name='" . esc_attr( $r['name'] ) . "' id='" . esc_attr( $r['id'] ) . "'>\n";
-			$output .= "\t<option value=\"-1\">$show_option_no_change</option>";
+		if ( $r['show_option_no_change'] ) {
-		if ( $show_option_none )
+			$output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
-			$output .= "\t<option value=\"" . esc_attr($option_none_value) . "\">$show_option_none</option>\n";
+		}
-		$output .= walk_page_dropdown_tree($pages, $depth, $r);
+		if ( $r['show_option_none'] ) {
+			$output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
+		}
+		$output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
 		$output .= "</select>\n";
 	}
-	$output = apply_filters('wp_dropdown_pages', $output);
+	/**
+	 * Filter the HTML output of a list of pages as a drop down.
-	if ( $echo )
+	 *
-		echo $output;
+	 * @since 2.1.0
+	 *
-	return $output;
+	 * @param string $output HTML output for drop down list of pages.
+	 */
+	$html = apply_filters( 'wp_dropdown_pages', $output );
+	if ( $r['echo'] ) {
+		echo $html;
+	}
+	return $html;
 }
 /**
 * Retrieve or display list of pages in list (li) format.
 *
 * @since 1.5.0
 *
-* @param array|string $args Optional. Override default arguments.
+* @see get_pages()
-* @return string HTML content, if not displaying.
+*
-*/
+* @param array|string $args {
-function wp_list_pages($args = '') {
+*     Array or string of arguments. Optional.
+*
+*     @type int    $child_of     Display only the sub-pages of a single page by ID. Default 0 (all pages).
+*     @type string $authors      Comma-separated list of author IDs. Default empty (all authors).
+*     @type string $date_format  PHP date format to use for the listed pages. Relies on the 'show_date' parameter.
+*                                Default is the value of 'date_format' option.
+*     @type int    $depth        Number of levels in the hierarchy of pages to include in the generated list.
+*                                Accepts -1 (any depth), 0 (all pages), 1 (top-level pages only), and n (pages to
+*                                the given n depth). Default 0.
+*     @type bool   $echo         Whether or not to echo the list of pages. Default true.
+*     @type string $exclude      Comma-separated list of page IDs to exclude. Default empty.
+*     @type array  $include      Comma-separated list of page IDs to include. Default empty.
+*     @type string $link_after   Text or HTML to follow the page link label. Default null.
+*     @type string $link_before  Text or HTML to precede the page link label. Default null.
+*     @type string $post_type    Post type to query for. Default 'page'.
+*     @type string $post_status  Comma-separated list of post statuses to include. Default 'publish'.
+*     @type string $show_date	  Whether to display the page publish or modified date for each page. Accepts
+*                                'modified' or any other value. An empty value hides the date. Default empty.
+*     @type string $sort_column  Comma-separated list of column names to sort the pages by. Accepts 'post_author',
+*                                'post_date', 'post_title', 'post_name', 'post_modified', 'post_modified_gmt',
+*                                'menu_order', 'post_parent', 'ID', 'rand', or 'comment_count'. Default 'post_title'.
+*     @type string $title_li     List heading. Passing a null or empty value will result in no heading, and the list
+*                                will not be wrapped with unordered list `<ul>` tags. Default 'Pages'.
+*     @type Walker $walker       Walker instance to use for listing pages. Default empty (Walker_Page).
+* }
+* @return string HTML list of pages.
+*/
+function wp_list_pages( $args = '' ) {
 	$defaults = array(
 		'depth' => 0, 'show_date' => '',
-		'date_format' => get_option('date_format'),
+		'date_format' => get_option( 'date_format' ),
 		'child_of' => 0, 'exclude' => '',
-		'title_li' => __('Pages'), 'echo' => 1,
+		'title_li' => __( 'Pages' ), 'echo' => 1,
 		'authors' => '', 'sort_column' => 'menu_order, post_title',
 		'link_before' => '', 'link_after' => '', 'walker' => '',
 	);
 	$r = wp_parse_args( $args, $defaults );
-	extract( $r, EXTR_SKIP );
 	$output = '';
 	$current_page = 0;
 	// sanitize, mostly to keep spaces out
-	$r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']);
+	$r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
 	// Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
-	$exclude_array = ( $r['exclude'] ) ? explode(',', $r['exclude']) : array();
+	$exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
-	$r['exclude'] = implode( ',', apply_filters('wp_list_pages_excludes', $exclude_array) );
+	/**
+	 * Filter the array of pages to exclude from the pages list.
+	 *
+	 * @since 2.1.0
+	 *
+	 * @param array $exclude_array An array of page IDs to exclude.
+	 */
+	$r['exclude'] = implode( ',', apply_filters( 'wp_list_pages_excludes', $exclude_array ) );
 	// Query pages.
 	$r['hierarchical'] = 0;
-	$pages = get_pages($r);
+	$pages = get_pages( $r );
-	if ( !empty($pages) ) {
+	if ( ! empty( $pages ) ) {
-		if ( $r['title_li'] )
+		if ( $r['title_li'] ) {
 			$output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+		}
 		global $wp_query;
-		if ( is_page() || is_attachment() || $wp_query->is_posts_page )
+		if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
-			$current_page = $wp_query->get_queried_object_id();
+			$current_page = get_queried_object_id();
-		$output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
+		} elseif ( is_singular() ) {
+			$queried_object = get_queried_object();
-		if ( $r['title_li'] )
+			if ( is_post_type_hierarchical( $queried_object->post_type ) ) {
+				$current_page = $queried_object->ID;
+			}
+		}
+		$output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
+		if ( $r['title_li'] ) {
 			$output .= '</ul></li>';
-	}
+		}
+	}
-	$output = apply_filters('wp_list_pages', $output, $r);
+	/**
-	if ( $r['echo'] )
+	 * Filter the HTML output of the pages to list.
-		echo $output;
+	 *
-	else
+	 * @since 1.5.1
-		return $output;
+	 *
+	 * @see wp_list_pages()
+	 *
+	 * @param string $output HTML output of the pages list.
+	 * @param array  $r      An array of page-listing arguments.
+	 */
+	$html = apply_filters( 'wp_list_pages', $output, $r );
+	if ( $r['echo'] ) {
+		echo $html;
+	} else {
+		return $html;
+	}
 }
 /**
 * Display or retrieve list of pages with optional home link.
 *
 * The arguments are listed below and part of the arguments are for {@link
 * wp_list_pages()} function. Check that function for more info on those
 * arguments.
 *
-* <ul>
-* <li><strong>sort_column</strong> - How to sort the list of pages. Defaults
-* to 'menu_order, post_title'. Use column for posts table.</li>
-* <li><strong>menu_class</strong> - Class to use for the div ID which contains
-* the page list. Defaults to 'menu'.</li>
-* <li><strong>echo</strong> - Whether to echo list or return it. Defaults to
-* echo.</li>
-* <li><strong>link_before</strong> - Text before show_home argument text.</li>
-* <li><strong>link_after</strong> - Text after show_home argument text.</li>
-* <li><strong>show_home</strong> - If you set this argument, then it will
-* display the link to the home page. The show_home argument really just needs
-* to be set to the value of the text of the link.</li>
-* </ul>
-*
 * @since 2.7.0
 *
-* @param array|string $args
+* @param array|string $args {
+*     Optional. Arguments to generate a page menu. See wp_list_pages() for additional arguments.
+*
+*     @type string          $sort_column How to short the list of pages. Accepts post column names.
+*                                        Default 'menu_order, post_title'.
+*     @type string          $menu_class  Class to use for the div ID containing the page list. Default 'menu'.
+*     @type bool            $echo        Whether to echo the list or return it. Accepts true (echo) or false (return).
+*                                        Default true.
+*     @type string          $link_before The HTML or text to prepend to $show_home text. Default empty.
+*     @type string          $link_after  The HTML or text to append to $show_home text. Default empty.
+*     @type int|bool|string $show_home   Whether to display the link to the home page. Can just enter the text
+*                                        you'd like shown for the home link. 1|true defaults to 'Home'.
+* }
 * @return string html menu
 */
 function wp_page_menu( $args = array() ) {
 	$defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
 	$args = wp_parse_args( $args, $defaults );
+	/**
+	 * Filter the arguments used to generate a page-based menu.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @see wp_page_menu()
+	 *
+	 * @param array $args An array of page menu arguments.
+	 */
 	$args = apply_filters( 'wp_page_menu_args', $args );
 	$menu = '';
 	$list_args = $args;
 	if ( $menu )
 		$menu = '<ul>' . $menu . '</ul>';
 	$menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+	/**
+	 * Filter the HTML output of a page-based menu.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @see wp_page_menu()
+	 *
+	 * @param string $menu The HTML output.
+	 * @param array  $args An array of arguments.
+	 */
 	$menu = apply_filters( 'wp_page_menu', $menu, $args );
 	if ( $args['echo'] )
 		echo $menu;
 	else
 		return $menu;
 }
 /**
 * Create HTML list of pages.
 *
-* @package WordPress
 * @since 2.1.0
 * @uses Walker
 */
 class Walker_Page extends Walker {
 	/**
 	 * @see Walker::$tree_type
 	 * @since 2.1.0
 	 * @var string
 	 */
-	var $tree_type = 'page';
+	public $tree_type = 'page';
 	/**
 	 * @see Walker::$db_fields
 	 * @since 2.1.0
 	 * @todo Decouple this.
 	 * @var array
 	 */
-	var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID');
+	public $db_fields = array ('parent' => 'post_parent', 'id' => 'ID');
 	/**
 	 * @see Walker::start_lvl()
 	 * @since 2.1.0
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param int $depth Depth of page. Used for padding.
 	 * @param array $args
 	 */
-	function start_lvl( &$output, $depth = 0, $args = array() ) {
+	public function start_lvl( &$output, $depth = 0, $args = array() ) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "\n$indent<ul class='children'>\n";
 	}
 	/**
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param int $depth Depth of page. Used for padding.
 	 * @param array $args
 	 */
-	function end_lvl( &$output, $depth = 0, $args = array() ) {
+	public function end_lvl( &$output, $depth = 0, $args = array() ) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
 	}
 	/**
 	 * @param object $page Page data object.
 	 * @param int $depth Depth of page. Used for padding.
 	 * @param int $current_page Page ID.
 	 * @param array $args
 	 */
-	function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
+	public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
-		if ( $depth )
+		if ( $depth ) {
-			$indent = str_repeat("\t", $depth);
+			$indent = str_repeat( "\t", $depth );
-		else
+		} else {
 			$indent = '';
+		}
-		extract($args, EXTR_SKIP);
-		$css_class = array('page_item', 'page-item-'.$page->ID);
+		$css_class = array( 'page_item', 'page-item-' . $page->ID );
-		if( isset( $args['pages_with_children'][ $page->ID ] ) )
+		if ( isset( $args['pages_with_children'][ $page->ID ] ) ) {
 			$css_class[] = 'page_item_has_children';
+		}
-		if ( !empty($current_page) ) {
+		if ( ! empty( $current_page ) ) {
 			$_current_page = get_post( $current_page );
-			if ( in_array( $page->ID, $_current_page->ancestors ) )
+			if ( $_current_page && in_array( $page->ID, $_current_page->ancestors ) ) {
 				$css_class[] = 'current_page_ancestor';
-			if ( $page->ID == $current_page )
+			}
+			if ( $page->ID == $current_page ) {
 				$css_class[] = 'current_page_item';
-			elseif ( $_current_page && $page->ID == $_current_page->post_parent )
+			} elseif ( $_current_page && $page->ID == $_current_page->post_parent ) {
 				$css_class[] = 'current_page_parent';
+			}
 		} elseif ( $page->ID == get_option('page_for_posts') ) {
 			$css_class[] = 'current_page_parent';
 		}
-		$css_class = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
+		/**
+		 * Filter the list of CSS classes to include with each page item in the list.
-		if ( '' === $page->post_title )
+		 *
+		 * @since 2.8.0
+		 *
+		 * @see wp_list_pages()
+		 *
+		 * @param array   $css_class    An array of CSS classes to be applied
+		 *                             to each list item.
+		 * @param WP_Post $page         Page data object.
+		 * @param int     $depth        Depth of page, used for padding.
+		 * @param array   $args         An array of arguments.
+		 * @param int     $current_page ID of the current page.
+		 */
+		$css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
+		if ( '' === $page->post_title ) {
 			$page->post_title = sprintf( __( '#%d (no title)' ), $page->ID );
+		}
+		$args['link_before'] = empty( $args['link_before'] ) ? '' : $args['link_before'];
+		$args['link_after'] = empty( $args['link_after'] ) ? '' : $args['link_after'];
 		/** This filter is documented in wp-includes/post-template.php */
-		$output .= $indent . '<li class="' . $css_class . '"><a href="' . get_permalink($page->ID) . '">' . $link_before . apply_filters( 'the_title', $page->post_title, $page->ID ) . $link_after . '</a>';
+		$output .= $indent . sprintf(
+			'<li class="%s"><a href="%s">%s%s%s</a>',
-		if ( !empty($show_date) ) {
+			$css_classes,
-			if ( 'modified' == $show_date )
+			get_permalink( $page->ID ),
+			$args['link_before'],
+			apply_filters( 'the_title', $page->post_title, $page->ID ),
+			$args['link_after']
+		);
+		if ( ! empty( $args['show_date'] ) ) {
+			if ( 'modified' == $args['show_date'] ) {
 				$time = $page->post_modified;
-			else
+			} else {
 				$time = $page->post_date;
+			}
-			$output .= " " . mysql2date($date_format, $time);
+			$date_format = empty( $args['date_format'] ) ? '' : $args['date_format'];
+			$output .= " " . mysql2date( $date_format, $time );
 		}
 	}
 	/**
 	 * @see Walker::end_el()
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param object $page Page data object. Not used.
 	 * @param int $depth Depth of page. Not Used.
 	 * @param array $args
 	 */
-	function end_el( &$output, $page, $depth = 0, $args = array() ) {
+	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
 		$output .= "</li>\n";
 	}
 }
 /**
 * Create HTML dropdown list of pages.
 *
-* @package WordPress
 * @since 2.1.0
 * @uses Walker
 */
 class Walker_PageDropdown extends Walker {
 	/**
 	 * @see Walker::$tree_type
 	 * @since 2.1.0
 	 * @var string
 	 */
-	var $tree_type = 'page';
+	public $tree_type = 'page';
 	/**
 	 * @see Walker::$db_fields
 	 * @since 2.1.0
 	 * @todo Decouple this
 	 * @var array
 	 */
-	var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID');
+	public $db_fields = array ('parent' => 'post_parent', 'id' => 'ID');
 	/**
 	 * @see Walker::start_el()
 	 * @since 2.1.0
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
-	 * @param object $page Page data object.
+	 * @param object $page   Page data object.
-	 * @param int $depth Depth of page in reference to parent pages. Used for padding.
+	 * @param int    $depth  Depth of page in reference to parent pages. Used for padding.
-	 * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
+	 * @param array  $args   Uses 'selected' argument for selected page to set selected HTML attribute for option
+	 *              element. Uses 'value_field' argument to fill "value" attribute. See {@see wp_dropdown_pages()}.
 	 * @param int $id
 	 */
-	function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
 		$pad = str_repeat('&nbsp;', $depth * 3);
-		$output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
+		if ( ! isset( $args['value_field'] ) || ! isset( $page->{$args['value_field']} ) ) {
+			$args['value_field'] = 'ID';
+		}
+		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $page->{$args['value_field']} ) . "\"";
 		if ( $page->ID == $args['selected'] )
 			$output .= ' selected="selected"';
 		$output .= '>';
-		$title = apply_filters( 'list_pages', $page->post_title, $page );
+		$title = $page->post_title;
+		if ( '' === $title ) {
+			$title = sprintf( __( '#%d (no title)' ), $page->ID );
+		}
+		/**
+		 * Filter the page title when creating an HTML drop-down list of pages.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param string $title Page title.
+		 * @param object $page  Page data object.
+		 */
+		$title = apply_filters( 'list_pages', $title, $page );
 		$output .= $pad . esc_html( $title );
 		$output .= "</option>\n";
 	}
 }
 /**
 * Display an attachment page link using an image or icon.
 *
 * @since 2.0.0
 *
-* @param int $id Optional. Post ID.
+* @param int|WP_Post $id Optional. Post ID or post object.
-* @param bool $fullsize Optional, default is false. Whether to use full size.
+* @param bool        $fullsize     Optional, default is false. Whether to use full size.
-* @param bool $deprecated Deprecated. Not used.
+* @param bool        $deprecated   Deprecated. Not used.
-* @param bool $permalink Optional, default is false. Whether to include permalink.
+* @param bool        $permalink    Optional, default is false. Whether to include permalink.
 */
 function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
 	if ( !empty( $deprecated ) )
 		_deprecated_argument( __FUNCTION__, '2.5' );
 /**
 * Retrieve an attachment page link using an image or icon, if possible.
 *
 * @since 2.5.0
-* @uses apply_filters() Calls 'wp_get_attachment_link' filter on HTML content with same parameters as function.
+*
-*
+* @param int|WP_Post  $id        Optional. Post ID or post object.
-* @param int $id Optional. Post ID.
+* @param string       $size      Optional, default is 'thumbnail'. Size of image, either array or string.
-* @param string $size Optional, default is 'thumbnail'. Size of image, either array or string.
+* @param bool         $permalink Optional, default is false. Whether to add permalink to image.
-* @param bool $permalink Optional, default is false. Whether to add permalink to image.
+* @param bool         $icon      Optional, default is false. Whether to include icon.
-* @param bool $icon Optional, default is false. Whether to include icon.
+* @param string|bool  $text      Optional, default is false. If string, then will be link text.
-* @param string|bool $text Optional, default is false. If string, then will be link text.
+* @param array|string $attr      Optional. Array or string of attributes.
 * @return string HTML content.
 */
-function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false ) {
+function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
 	$id = intval( $id );
 	$_post = get_post( $id );
 	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
 		return __( 'Missing Attachment' );
 	if ( $permalink )
 		$url = get_attachment_link( $_post->ID );
-	$post_title = esc_attr( $_post->post_title );
+	if ( $text ) {
-	if ( $text )
 		$link_text = $text;
-	elseif ( $size && 'none' != $size )
+	} elseif ( $size && 'none' != $size ) {
-		$link_text = wp_get_attachment_image( $id, $size, $icon );
+		$link_text = wp_get_attachment_image( $id, $size, $icon, $attr );
-	else
+	} else {
 		$link_text = '';
+	}
 	if ( trim( $link_text ) == '' )
 		$link_text = $_post->post_title;
+	/**
+	 * Filter a retrieved attachment page link.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param string      $link_html The page link HTML output.
+	 * @param int         $id        Post ID.
+	 * @param string      $size      Image size. Default 'thumbnail'.
+	 * @param bool        $permalink Whether to add permalink to image. Default false.
+	 * @param bool        $icon      Whether to include an icon. Default false.
+	 * @param string|bool $text      If string, will be link text. Default false.
+	 */
 	return apply_filters( 'wp_get_attachment_link', "<a href='$url'>$link_text</a>", $id, $size, $permalink, $icon, $text );
 }
 /**
-* Wrap attachment in <<p>> element before content.
+* Wrap attachment in paragraph tag before content.
 *
 * @since 2.0.0
-* @uses apply_filters() Calls 'prepend_attachment' hook on HTML content.
 *
 * @param string $content
 * @return string
 */
 function prepend_attachment($content) {
 	$post = get_post();
 	if ( empty($post->post_type) || $post->post_type != 'attachment' )
 		return $content;
-	$p = '<p class="attachment">';
+	if ( wp_attachment_is( 'video', $post ) ) {
-	// show the medium sized image representation of the attachment if available, and link to the raw file
+		$meta = wp_get_attachment_metadata( get_the_ID() );
-	$p .= wp_get_attachment_link(0, 'medium', false);
+		$atts = array( 'src' => wp_get_attachment_url() );
-	$p .= '</p>';
+		if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
-	$p = apply_filters('prepend_attachment', $p);
+			$atts['width'] = (int) $meta['width'];
+			$atts['height'] = (int) $meta['height'];
+		}
+		if ( has_post_thumbnail() ) {
+			$atts['poster'] = wp_get_attachment_url( get_post_thumbnail_id() );
+		}
+		$p = wp_video_shortcode( $atts );
+	} elseif ( wp_attachment_is( 'audio', $post ) ) {
+		$p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) );
+	} else {
+		$p = '<p class="attachment">';
+		// show the medium sized image representation of the attachment if available, and link to the raw file
+		$p .= wp_get_attachment_link(0, 'medium', false);
+		$p .= '</p>';
+	}
+	/**
+	 * Filter the attachment markup to be prepended to the post content.
+	 *
+	 * @since 2.0.0
+	 *
+	 * @see prepend_attachment()
+	 *
+	 * @param string $p The attachment HTML output.
+	 */
+	$p = apply_filters( 'prepend_attachment', $p );
 	return "$p\n$content";
 }
 //
 /**
 * Retrieve protected post password form content.
 *
 * @since 1.0.0
-* @uses apply_filters() Calls 'the_password_form' filter on output.
+*
-* @param int|WP_Post $post Optional. A post id or post object. Defaults to the current post when in The Loop, undefined otherwise.
+* @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
 * @return string HTML content for password form for password protected post.
 */
 function get_the_password_form( $post = 0 ) {
 	$post = get_post( $post );
 	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
 	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
 	<p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
-	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__( 'Submit' ) . '" /></p>
+	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__( 'Submit' ) . '" /></p></form>
-	</form>
 	';
+	/**
+	 * Filter the HTML output for the protected post password form.
+	 *
+	 * If modifying the password field, please note that the core database schema
+	 * limits the password field to 20 characters regardless of the value of the
+	 * size attribute in the form input.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param string $output The password form HTML output.
+	 */
 	return apply_filters( 'the_password_form', $output );
 }
 /**
 * Whether currently in a page template.
 *
 * This template tag allows you to determine if you are in a page template.
-* You can optionally provide a template name and then the check will be
+* You can optionally provide a template name or array of template names
-* specific to that template.
+* and then the check will be specific to that template.
 *
 * @since 2.5.0
-* @uses $wp_query
+* @since 4.2.0 The `$template` parameter was changed to also accept an array of page templates.
 *
-* @param string $template The specific template name if specific matching is required.
+* @param string|array $template The specific template name or array of templates to match.
 * @return bool True on success, false on failure.
 */
 function is_page_template( $template = '' ) {
 	if ( ! is_page() )
 		return false;
 	if ( empty( $template ) )
 		return (bool) $page_template;
 	if ( $template == $page_template )
 		return true;
+	if ( is_array( $template ) ) {
+		if ( ( in_array( 'default', $template, true ) && ! $page_template )
+			|| in_array( $page_template, $template, true )
+		) {
+			return true;
+		}
+	}
 	if ( 'default' == $template && ! $page_template )
 		return true;
 	return false;
 }
 /**
 * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
 *
-* @package WordPress
-* @subpackage Post_Revisions
 * @since 2.6.0
-*
-* @uses date_i18n()
 *
 * @param int|object $revision Revision ID or revision object.
 * @param bool $link Optional, default is true. Link to revisions's page?
 * @return string i18n formatted datetimestamp or localized 'Current Revision'.
 */
 	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
 		return false;
 	/* translators: revision date format, see http://php.net/date */
-	$datef = _x( 'j F, Y @ G:i', 'revision date format');
+	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
 	/* translators: 1: date */
 	$autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
 	/* translators: 1: date */
 	$currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
 }
 /**
 * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
 *
-* @package WordPress
-* @subpackage Post_Revisions
 * @since 3.6.0
-*
-* @uses date_i18n()
 *
 * @param int|object $revision Revision ID or revision object.
 * @param bool $link Optional, default is true. Link to revisions's page?
 * @return string gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
 */
 	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
 		return false;
 	$author = get_the_author_meta( 'display_name', $revision->post_author );
 	/* translators: revision date format, see http://php.net/date */
-	$datef = _x( 'j F, Y @ G:i:s', 'revision date format');
+	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
 	$gravatar = get_avatar( $revision->post_author, 24 );
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
 	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
 * Display list of a post's revisions.
 *
 * Can output either a UL with edit links or a TABLE with diff interface, and
 * restore action links.
 *
-* @package WordPress
-* @subpackage Post_Revisions
 * @since 2.6.0
 *
-* @uses wp_get_post_revisions()
+* @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
-* @uses wp_post_revision_title_expanded()
+* @param string      $type    'all' (default), 'revision' or 'autosave'
-* @uses get_edit_post_link()
-* @uses get_the_author_meta()
-*
-* @param int|object $post_id Post ID or post object.
-* @param string $type 'all' (default), 'revision' or 'autosave'
 * @return null
 */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
 	if ( ! $post = get_post( $post_id ) )
 		return;

changeset 5	5e2f62d02dcd
parent 0	d970ebf37754
child 7	cf61fcea0001