WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / post-template.php

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index bf4671b6fe0ee775ddb9765f99b3f6d6647598ac..3164509b8e4fda1d3986c0c0a1b1be04277b079a 100644 (file)
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -21,13 +21,12 @@ function the_ID() {
  * Retrieve the ID of the current item in the WordPress Loop.
  *
  * @since 2.1.0
  * Retrieve the ID of the current item in the WordPress Loop.
  *
  * @since 2.1.0

- * @uses $post

  *
  *

- * @return int
+ * @return int|false The ID of the current item in the WordPress Loop. False if $post is not set.

  */
 function get_the_ID() {
  */
 function get_the_ID() {

-       global $post;
-       return $post->ID;
+       $post = get_post();
+       return ! empty( $post ) ? $post->ID : false;

 }
 
 /**
 }
 
 /**


@@ -36,11 +35,11 @@ function get_the_ID() {
  * @since 0.71
  *
  * @param string $before Optional. Content to prepend to the title.
  * @since 0.71
  *
  * @param string $before Optional. Content to prepend to the title.

- * @param string $after Optional. Content to append to the title.
- * @param bool $echo Optional, default to true.Whether to display or return.
- * @return null|string Null on no title. String if $echo parameter is false.
+ * @param string $after  Optional. Content to append to the title.
+ * @param bool   $echo   Optional, default to true.Whether to display or return.
+ * @return string|void String if $echo parameter is false.

  */
  */

-function the_title($before = '', $after = '', $echo = true) {
+function the_title( $before = '', $after = '', $echo = true ) {

        $title = get_the_title();
 
        if ( strlen($title) == 0 )
        $title = get_the_title();
 
        if ( strlen($title) == 0 )


@@ -66,27 +65,34 @@ function the_title($before = '', $after = '', $echo = true) {
  *
  * @since 2.3.0
  *
  *
  * @since 2.3.0
  *

- * @param string|array $args Optional. Override the defaults.
- * @return string|null Null on failure or display. String when echo is false.
+ * @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|void String when echo is false.

  */
 function the_title_attribute( $args = '' ) {
  */
 function the_title_attribute( $args = '' ) {

-       $title = get_the_title();
-
-       if ( strlen($title) == 0 )
-               return;
+       $defaults = array( 'before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
+       $r = wp_parse_args( $args, $defaults );

 
 

-       $defaults = array('before' => '', 'after' =>  '', 'echo' => true);
-       $r = wp_parse_args($args, $defaults);
-       extract( $r, EXTR_SKIP );
+       $title = get_the_title( $r['post'] );

 
 

+       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;
                echo $title;

-       else
+       } else {

                return $title;
                return $title;

+       }

 }
 
 /**
 }
 
 /**


@@ -98,24 +104,57 @@ function the_title_attribute( $args = '' ) {
  *
  * @since 0.71
  *
  *
  * @since 0.71
  *

- * @param int $id Optional. Post ID.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.

  * @return string
  */
  * @return string
  */

-function get_the_title( $id = 0 ) {
-       $post = &get_post($id);
-
-       $title = isset($post->post_title) ? $post->post_title : '';
-       $id = isset($post->ID) ? $post->ID : (int) $id;
-
-       if ( !is_admin() ) {
-               if ( !empty($post->post_password) ) {
-                       $protected_title_format = apply_filters('protected_title_format', __('Protected: %s'));
-                       $title = sprintf($protected_title_format, $title);
-               } else if ( isset($post->post_status) && 'private' == $post->post_status ) {
-                       $private_title_format = apply_filters('private_title_format', __('Private: %s'));
-                       $title = sprintf($private_title_format, $title);
+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 ) ) {
+
+                       /**
+                        * 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 );
+               } elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
+
+                       /**
+                        * 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 );
 }
 
        return apply_filters( 'the_title', $title, $id );
 }
 


@@ -130,10 +169,19 @@ function get_the_title( $id = 0 ) {
  *
  * @since 1.5.0
  *
  *
  * @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 ) {
  */
 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 ) );

 }
 
 /**
 }
 
 /**


@@ -145,13 +193,20 @@ function the_guid( $id = 0 ) {
  *
  * @since 1.5.0
  *
  *
  * @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 ) {
  * @return string
  */
 function get_the_guid( $id = 0 ) {

-       $post = &get_post($id);
+       $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 );

 }
 
 /**
 }
 
 /**


@@ -160,12 +215,20 @@ function get_the_guid( $id = 0 ) {
  * @since 0.71
  *
  * @param string $more_link_text Optional. Content for when there is more text.
  * @since 0.71
  *
  * @param string $more_link_text Optional. Content for when there is more text.

- * @param string $stripteaser Optional. Teaser content before the more text.
+ * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.

  */
  */

-function the_content($more_link_text = null, $stripteaser = 0) {
-       $content = get_the_content($more_link_text, $stripteaser);
-       $content = apply_filters('the_content', $content);
-       $content = str_replace(']]>', ']]>', $content);
+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( ']]>', ']]>', $content );

        echo $content;
 }
 
        echo $content;
 }
 


@@ -174,67 +237,88 @@ function the_content($more_link_text = null, $stripteaser = 0) {
  *
  * @since 0.71
  *
  *
  * @since 0.71
  *

+ * @global int   $page
+ * @global int   $more
+ * @global bool  $preview
+ * @global array $pages
+ * @global int   $multipage
+ *

  * @param string $more_link_text Optional. Content for when there is more text.
  * @param string $more_link_text Optional. Content for when there is more text.

- * @param string $stripteaser Optional. Teaser content before the more text.
+ * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.

  * @return string
  */
  * @return string
  */

-function get_the_content($more_link_text = null, $stripteaser = 0) {
-       global $post, $more, $page, $pages, $multipage, $preview;
+function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+       global $page, $more, $preview, $pages, $multipage;
+
+       $post = get_post();

 
        if ( null === $more_link_text )
 
        if ( null === $more_link_text )

-               $more_link_text = __( '(more...)' );
+               $more_link_text = __( '(more…)' );

 
        $output = '';
 
        $output = '';

-       $hasTeaser = false;
+       $has_teaser = false;

 
        // If post password required and it doesn't match the cookie.
 
        // If post password required and it doesn't match the cookie.

-       if ( post_password_required($post) ) {
-               $output = get_the_password_form();
-               return $output;
-       }
+       if ( post_password_required( $post ) )
+               return get_the_password_form( $post );

 
 

-       if ( $page > count($pages) ) // if the requested page doesn't exist
-               $page = count($pages); // give them the highest numbered page that DOES exist
+       if ( $page > count( $pages ) ) // if the requested page doesn't exist
+               $page = count( $pages ); // give them the highest numbered page that DOES exist

 
 

-       $content = $pages[$page-1];
-       if ( preg_match('/<!--more(.*?)?-->/', $content, $matches) ) {
-               $content = explode($matches[0], $content, 2);
-               if ( !empty($matches[1]) && !empty($more_link_text) )
-                       $more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
+       $content = $pages[$page - 1];
+       if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
+               $content = explode( $matches[0], $content, 2 );
+               if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
+                       $more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );

 
 

-               $hasTeaser = true;
+               $has_teaser = true;

        } else {
        } else {

-               $content = array($content);
+               $content = array( $content );

        }
        }

-       if ( (false !== strpos($post->post_content, '<!--noteaser-->') && ((!$multipage) || ($page==1))) )
-               $stripteaser = 1;
+
+       if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
+               $strip_teaser = true;
+

        $teaser = $content[0];
        $teaser = $content[0];

-       if ( ($more) && ($stripteaser) && ($hasTeaser) )
+
+       if ( $more && $strip_teaser && $has_teaser )

                $teaser = '';
                $teaser = '';

+

        $output .= $teaser;
        $output .= $teaser;

-       if ( count($content) > 1 ) {
+
+       if ( count( $content ) > 1 ) {

                if ( $more ) {
                        $output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
                } else {
                if ( $more ) {
                        $output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
                } else {

-                       if ( ! empty($more_link_text) )
+                       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 .= 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);
+                       $output = force_balance_tags( $output );

                }
                }

-

        }
        }

-       if ( $preview ) // preview fix for javascript bug with foreign languages
-               $output =       preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output);
+
+       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;
 }
 
 /**
 
        return $output;
 }
 
 /**

- * Preview fix for javascript bug with foreign languages
+ * Preview fix for JavaScript bug with foreign languages.

  *
  * @since 3.1.0
  * @access private
  *
  * @since 3.1.0
  * @access private

- * @param array $match Match array from preg_replace_callback
- * @returns string
+ *
+ * @param array $match Match array from preg_replace_callback.
+ * @return string

  */
 function _convert_urlencoded_to_entities( $match ) {
        return '&#' . base_convert( $match[1], 16, 10 ) . ';';
  */
 function _convert_urlencoded_to_entities( $match ) {
        return '&#' . base_convert( $match[1], 16, 10 ) . ';';


@@ -244,10 +328,19 @@ function _convert_urlencoded_to_entities( $match ) {
  * Display the post excerpt.
  *
  * @since 0.71
  * Display the post excerpt.
  *
  * @since 0.71

- * @uses apply_filters() Calls 'the_excerpt' hook on post excerpt.

  */
 function the_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() );

 }
 
 /**
 }
 
 /**


@@ -262,14 +355,23 @@ function get_the_excerpt( $deprecated = '' ) {
        if ( !empty( $deprecated ) )
                _deprecated_argument( __FUNCTION__, '2.3' );
 
        if ( !empty( $deprecated ) )
                _deprecated_argument( __FUNCTION__, '2.3' );
 

-       global $post;
-       $output = $post->post_excerpt;
-       if ( post_password_required($post) ) {
-               $output = __('There is no excerpt because this is a protected post.');
-               return $output;
+       $post = get_post();
+       if ( empty( $post ) ) {
+               return '';

        }
 
        }
 

-       return apply_filters('get_the_excerpt', $output);
+       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 );

 }
 
 /**
 }
 
 /**


@@ -277,11 +379,11 @@ function get_the_excerpt( $deprecated = '' ) {
  *
  * @since 2.3.0
  *
  *
  * @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 ) {
  * @return bool
  */
 function has_excerpt( $id = 0 ) {

-       $post = &get_post( $id );
+       $post = get_post( $id );

        return ( !empty( $post->post_excerpt ) );
 }
 
        return ( !empty( $post->post_excerpt ) );
 }
 


@@ -290,8 +392,8 @@ function has_excerpt( $id = 0 ) {
  *
  * @since 2.7.0
  *
  *
  * @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 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. Defaults to the global `$post`.

  */
 function post_class( $class = '', $post_id = null ) {
        // Separates classes with a single space, collates classes for post DIV
  */
 function post_class( $class = '', $post_id = null ) {
        // Separates classes with a single space, collates classes for post DIV


@@ -301,81 +403,121 @@ function post_class( $class = '', $post_id = null ) {
 /**
  * Retrieve the classes for the post div as an array.
  *
 /**
  * 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'
- * class name. The class 'hentry' is always added to each post. For each
- * category, the class will be added with 'category-' with category slug is
- * added. The tags are the same way as the categories with 'tag-' before the tag
- * slug. All classes are passed through the filter, 'post_class' with the list
- * of classes, followed by $class parameter value, with the post ID as the last
- * parameter.
+ * 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. If the post has a
+ * post thumbnail, 'has-post-thumbnail' is added as a class. For each taxonomy that
+ * the post belongs to, a class will be added of the format '{$taxonomy}-{$slug}' -
+ * eg 'category-foo' or 'my_custom_taxonomy-bar'. The 'post_tag' taxonomy is a special
+ * case; the class has the 'tag-' prefix instead of 'post_tag-'. All classes are
+ * 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 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 ) {
  * @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();
 
 
        $classes = array();
 

-       if ( empty($post) )
+       if ( $class ) {
+               if ( ! is_array( $class ) ) {
+                       $class = preg_split( '#\s+#', $class );
+               }
+               $classes = array_map( 'esc_attr', $class );
+       } else {
+               // Ensure that we always coerce class to being an array.
+               $class = array();
+       }
+
+       if ( ! $post ) {

                return $classes;
                return $classes;

+       }

 
        $classes[] = 'post-' . $post->ID;
 
        $classes[] = 'post-' . $post->ID;

-       $classes[] = $post->post_type;
+       if ( ! is_admin() )
+               $classes[] = $post->post_type;

        $classes[] = 'type-' . $post->post_type;
        $classes[] = 'status-' . $post->post_status;
 
        // Post Format
        $classes[] = 'type-' . $post->post_type;
        $classes[] = 'status-' . $post->post_status;
 
        // Post Format

-       $post_format = get_post_format( $post->ID );
-

        if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
        if ( post_type_supports( $post->post_type, 'post-formats' ) ) {

+               $post_format = get_post_format( $post->ID );
+

                if ( $post_format && !is_wp_error($post_format) )
                        $classes[] = 'format-' . sanitize_html_class( $post_format );
                else
                        $classes[] = 'format-standard';
        }
 
                if ( $post_format && !is_wp_error($post_format) )
                        $classes[] = 'format-' . sanitize_html_class( $post_format );
                else
                        $classes[] = 'format-standard';
        }
 

-       // post requires password
-       if ( post_password_required($post->ID) )
+       $post_password_required = post_password_required( $post->ID );
+
+       // Post requires password.
+       if ( $post_password_required ) {

                $classes[] = 'post-password-required';
                $classes[] = 'post-password-required';

+       } elseif ( ! empty( $post->post_password ) ) {
+               $classes[] = 'post-password-protected';
+       }
+
+       // Post thumbnails.
+       if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) && ! is_attachment( $post ) && ! $post_password_required ) {
+               $classes[] = 'has-post-thumbnail';
+       }

 
        // sticky for Sticky Posts
 
        // sticky for Sticky Posts

-       if ( is_sticky($post->ID) && is_home() && !is_paged() )
-               $classes[] = 'sticky';
+       if ( is_sticky( $post->ID ) ) {
+               if ( is_home() && ! is_paged() ) {
+                       $classes[] = 'sticky';
+               } elseif ( is_admin() ) {
+                       $classes[] = 'status-sticky';
+               }
+       }

 
        // hentry for hAtom compliance
        $classes[] = 'hentry';
 
 
        // hentry for hAtom compliance
        $classes[] = 'hentry';
 

-       // Categories
-       if ( is_object_in_taxonomy( $post->post_type, 'category' ) ) {
-               foreach ( (array) get_the_category($post->ID) as $cat ) {
-                       if ( empty($cat->slug ) )
-                               continue;
-                       $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id);
-               }
-       }
+       // All public taxonomies
+       $taxonomies = get_taxonomies( array( 'public' => true ) );
+       foreach ( (array) $taxonomies as $taxonomy ) {
+               if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
+                       foreach ( (array) get_the_terms( $post->ID, $taxonomy ) as $term ) {
+                               if ( empty( $term->slug ) ) {
+                                       continue;
+                               }

 
 

-       // Tags
-       if ( is_object_in_taxonomy( $post->post_type, 'post_tag' ) ) {
-               foreach ( (array) get_the_tags($post->ID) as $tag ) {
-                       if ( empty($tag->slug ) )
-                               continue;
-                       $classes[] = 'tag-' . sanitize_html_class($tag->slug, $tag->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;
+                               }
+
+                               // 'post_tag' uses the 'tag' prefix for backward compatibility.
+                               if ( 'post_tag' == $taxonomy ) {
+                                       $classes[] = 'tag-' . $term_class;
+                               } else {
+                                       $classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
+                               }
+                       }

                }
        }
 
                }
        }
 

-       if ( !empty($class) ) {
-               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);
+       /**
+        * Filter the list of CSS classes for the current post.
+        *
+        * @since 2.7.0
+        *
+        * @param array $classes An array of post classes.
+        * @param array $class   An array of additional classes added to the post.
+        * @param int   $post_id The post ID.
+        */
+       $classes = apply_filters( 'post_class', $classes, $class, $post->ID );

 
 

-       return apply_filters('post_class', $classes, $class, $post->ID);
+       return array_unique( $classes );

 }
 
 /**
 }
 
 /**


@@ -395,11 +537,13 @@ function body_class( $class = '' ) {
  *
  * @since 2.8.0
  *
  *
  * @since 2.8.0
  *

+ * @global WP_Query $wp_query
+ *

  * @param string|array $class One or more classes to add to the class list.
  * @return array Array of classes.
  */
 function get_body_class( $class = '' ) {
  * @param string|array $class One or more classes to add to the class list.
  * @return array Array of classes.
  */
 function get_body_class( $class = '' ) {

-       global $wp_query, $wpdb;
+       global $wp_query;

 
        $classes = array();
 
 
        $classes = array();
 


@@ -414,8 +558,10 @@ function get_body_class( $class = '' ) {
                $classes[] = 'archive';
        if ( is_date() )
                $classes[] = 'date';
                $classes[] = 'archive';
        if ( is_date() )
                $classes[] = 'date';

-       if ( is_search() )
+       if ( is_search() ) {

                $classes[] = 'search';
                $classes[] = 'search';

+               $classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
+       }

        if ( is_paged() )
                $classes[] = 'paged';
        if ( is_attachment() )
        if ( is_paged() )
                $classes[] = 'paged';
        if ( is_attachment() )


@@ -428,16 +574,20 @@ function get_body_class( $class = '' ) {
                $post = $wp_query->get_queried_object();
 
                $classes[] = 'single';
                $post = $wp_query->get_queried_object();
 
                $classes[] = 'single';

-               $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
-               $classes[] = 'postid-' . $post_id;
-
-               // Post Format
-               $post_format = get_post_format( $post->ID );
-
-               if ( $post_format && !is_wp_error($post_format) )
-                       $classes[] = 'single-format-' . sanitize_html_class( $post_format );
-               else
-                       $classes[] = 'single-format-standard';
+               if ( isset( $post->post_type ) ) {
+                       $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
+                       $classes[] = 'postid-' . $post_id;
+
+                       // Post Format
+                       if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+                               $post_format = get_post_format( $post->ID );
+
+                               if ( $post_format && !is_wp_error($post_format) )
+                                       $classes[] = 'single-format-' . sanitize_html_class( $post_format );
+                               else
+                                       $classes[] = 'single-format-standard';
+                       }
+               }

 
                if ( is_attachment() ) {
                        $mime_type = get_post_mime_type($post_id);
 
                if ( is_attachment() ) {
                        $mime_type = get_post_mime_type($post_id);


@@ -448,39 +598,66 @@ function get_body_class( $class = '' ) {
        } elseif ( is_archive() ) {
                if ( is_post_type_archive() ) {
                        $classes[] = 'post-type-archive';
        } elseif ( is_archive() ) {
                if ( is_post_type_archive() ) {
                        $classes[] = 'post-type-archive';

-                       $classes[] = 'post-type-archive-' . sanitize_html_class( get_query_var( 'post_type' ) );
-               } else if ( is_author() ) {
+                       $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 );
+               } elseif ( is_author() ) {

                        $author = $wp_query->get_queried_object();
                        $classes[] = 'author';
                        $author = $wp_query->get_queried_object();
                        $classes[] = 'author';

-                       $classes[] = 'author-' . sanitize_html_class( $author->user_nicename , $author->ID );
-                       $classes[] = 'author-' . $author->ID;
+                       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';
                } elseif ( is_category() ) {
                        $cat = $wp_query->get_queried_object();
                        $classes[] = 'category';

-                       $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
-                       $classes[] = 'category-' . $cat->term_id;
+                       if ( isset( $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() ) {
                } elseif ( is_tag() ) {

-                       $tags = $wp_query->get_queried_object();
+                       $tag = $wp_query->get_queried_object();

                        $classes[] = 'tag';
                        $classes[] = 'tag';

-                       $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
-                       $classes[] = 'tag-' . $tags->term_id;
+                       if ( isset( $tag->term_id ) ) {
+                               $tag_class = sanitize_html_class( $tag->slug, $tag->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();
                } elseif ( is_tax() ) {
                        $term = $wp_query->get_queried_object();

-                       $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-                       $classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id );
-                       $classes[] = 'term-' . $term->term_id;
+                       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-' . $term_class;
+                               $classes[] = 'term-' . $term->term_id;
+                       }

                }
        } elseif ( is_page() ) {
                $classes[] = 'page';
 
                $page_id = $wp_query->get_queried_object_id();
 
                }
        } elseif ( is_page() ) {
                $classes[] = 'page';
 
                $page_id = $wp_query->get_queried_object_id();
 

-               $post = get_page($page_id);
+               $post = get_post($page_id);

 
                $classes[] = 'page-id-' . $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';
                        $classes[] = 'page-parent';

+               }

 
                if ( $post->post_parent ) {
                        $classes[] = 'page-child';
 
                if ( $post->post_parent ) {
                        $classes[] = 'page-child';


@@ -488,27 +665,36 @@ function get_body_class( $class = '' ) {
                }
                if ( is_page_template() ) {
                        $classes[] = 'page-template';
                }
                if ( is_page_template() ) {
                        $classes[] = 'page-template';

-                       $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $page_id, '_wp_page_template', true ) ), '' );
+
+                       $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';

                }
                }

-       } elseif ( is_search() ) {
-               if ( !empty( $wp_query->posts ) )
-                       $classes[] = 'search-results';
-               else
-                       $classes[] = 'search-no-results';

        }
 
        if ( is_user_logged_in() )
                $classes[] = 'logged-in';
 
        }
 
        if ( is_user_logged_in() )
                $classes[] = 'logged-in';
 

-       if ( is_admin_bar_showing() )
+       if ( is_admin_bar_showing() ) {

                $classes[] = 'admin-bar';
                $classes[] = 'admin-bar';

+               $classes[] = 'no-customize-support';
+       }
+
+       if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
+               $classes[] = 'custom-background';

 
        $page = $wp_query->get( 'page' );
 
 
        $page = $wp_query->get( 'page' );
 

-       if ( !$page || $page < 2)
+       if ( ! $page || $page < 2 )

                $page = $wp_query->get( 'paged' );
 
                $page = $wp_query->get( 'paged' );
 

-       if ( $page && $page > 1 ) {
+       if ( $page && $page > 1 && ! is_404() ) {

                $classes[] = 'paged-' . $page;
 
                if ( is_single() )
                $classes[] = 'paged-' . $page;
 
                if ( is_single() )


@@ -529,15 +715,28 @@ function get_body_class( $class = '' ) {
                        $classes[] = 'post-type-paged-' . $page;
        }
 
                        $classes[] = 'post-type-paged-' . $page;
        }
 

-       if ( !empty( $class ) ) {
+       if ( ! empty( $class ) ) {

                if ( !is_array( $class ) )
                        $class = preg_split( '#\s+#', $class );
                $classes = array_merge( $classes, $class );
                if ( !is_array( $class ) )
                        $class = preg_split( '#\s+#', $class );
                $classes = array_merge( $classes, $class );

+       } else {
+               // Ensure that we always coerce class to being an array.
+               $class = array();

        }
 
        $classes = array_map( 'esc_attr', $classes );
 
        }
 
        $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 array $class   An array of additional classes added to the body.
+        */
+       $classes = apply_filters( 'body_class', $classes, $class );
+
+       return array_unique( $classes );

 }
 
 /**
 }
 
 /**


@@ -545,44 +744,31 @@ function get_body_class( $class = '' ) {
  *
  * @since 2.7.0
  *
  *
  * @since 2.7.0
  *

- * @param int|object $post An optional post.  Global $post used if not provided.
+ * @param int|WP_Post|null $post An optional post. Global $post used if not provided.

  * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
  */
 function post_password_required( $post = null ) {
        $post = get_post($post);
 
  * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
  */
 function post_password_required( $post = null ) {
        $post = get_post($post);
 

-       if ( empty($post->post_password) )
+       if ( empty( $post->post_password ) )

                return false;
 
                return false;
 

-       if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
+       if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )

                return true;
 
                return true;
 

-       if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
-               return true;
+       require_once ABSPATH . WPINC . '/class-phpass.php';
+       $hasher = new PasswordHash( 8, true );

 
 

-       return false;
-}
-
-/**
- * Display "sticky" CSS class, if a post is sticky.
- *
- * @since 2.7.0
- *
- * @param int $post_id An optional post ID.
- */
-function sticky_class( $post_id = null ) {
-       if ( !is_sticky($post_id) )
-               return;
+       $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
+       if ( 0 !== strpos( $hash, '$P$B' ) )
+               return true;

 
 

-       echo " sticky";
+       return ! $hasher->CheckPassword( $post->post_password, $hash );

 }
 
 }
 

-/**
- * Page Template Functions for usage in Themes
- *
- * @package WordPress
- * @subpackage Template
- */
+//
+// Page Template Functions for usage in Themes
+//

 
 /**
  * The formatted output of a list of pages.
 
 /**
  * The formatted output of a list of pages.


@@ -590,85 +776,122 @@ function sticky_class( $post_id = null ) {
  * Displays page links for paginated posts (i.e. includes the <!--nextpage-->.
  * Quicktag one or more times). This tag must be within The Loop.
  *
  * 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:
- * 'next_or_number' - Default is 'number' (string). Indicates whether page
- *      numbers should be used. Valid values are number and next.
- * '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.
- * '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.
- *

  * @since 1.2.0
  * @since 1.2.0

- * @access private

  *
  *

- * @param string|array $args Optional. Overwrite the defaults.
+ * @global int $page
+ * @global int $numpages
+ * @global int $multipage
+ * @global int $more
+ *
+ * @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.
  */
  * @return string Formatted output in HTML.
  */

-function wp_link_pages($args = '') {
+function wp_link_pages( $args = '' ) {
+       global $page, $numpages, $multipage, $more;
+

        $defaults = array(
        $defaults = array(

-               'before' => '<p>' . __('Pages:'), 'after' => '</p>',
-               'link_before' => '', 'link_after' => '',
-               'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
-               'previouspagelink' => __('Previous page'), 'pagelink' => '%',
-               'echo' => 1
+               'before'           => '<p>' . __( 'Pages:' ),
+               'after'            => '</p>',
+               'link_before'      => '',
+               'link_after'       => '',
+               'next_or_number'   => 'number',
+               'separator'        => ' ',
+               'nextpagelink'     => __( 'Next page' ),
+               'previouspagelink' => __( 'Previous page' ),
+               'pagelink'         => '%',
+               'echo'             => 1

        );
 
        );
 

-       $r = wp_parse_args( $args, $defaults );
-       $r = apply_filters( 'wp_link_pages_args', $r );
-       extract( $r, EXTR_SKIP );
+       $params = wp_parse_args( $args, $defaults );

 
 

-       global $page, $numpages, $multipage, $more, $pagenow;
+       /**
+        * 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 );

 
        $output = '';
        if ( $multipage ) {
 
        $output = '';
        if ( $multipage ) {

-               if ( 'number' == $next_or_number ) {
-                       $output .= $before;
-                       for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) {
-                               $j = str_replace('%',$i,$pagelink);
-                               $output .= ' ';
-                               if ( ($i != $page) || ((!$more) && ($page==1)) ) {
-                                       $output .= _wp_link_page($i);
+               if ( 'number' == $r['next_or_number'] ) {
+                       $output .= $r['before'];
+                       for ( $i = 1; $i <= $numpages; $i++ ) {
+                               $link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
+                               if ( $i != $page || ! $more && 1 == $page ) {
+                                       $link = _wp_link_page( $i ) . $link . '</a>';

                                }
                                }

-                               $output .= $link_before . $j . $link_after;
-                               if ( ($i != $page) || ((!$more) && ($page==1)) )
-                                       $output .= '</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 );
+
+                               // Use the custom links separator beginning with the second link.
+                               $output .= ( 1 === $i ) ? ' ' : $r['separator'];
+                               $output .= $link;

                        }
                        }

-                       $output .= $after;
-               } else {
-                       if ( $more ) {
-                               $output .= $before;
-                               $i = $page - 1;
-                               if ( $i && $more ) {
-                                       $output .= _wp_link_page($i);
-                                       $output .= $link_before. $previouspagelink . $link_after . '</a>';
-                               }
-                               $i = $page + 1;
-                               if ( $i <= $numpages && $more ) {
-                                       $output .= _wp_link_page($i);
-                                       $output .= $link_before. $nextpagelink . $link_after . '</a>';
+                       $output .= $r['after'];
+               } elseif ( $more ) {
+                       $output .= $r['before'];
+                       $prev = $page - 1;
+                       if ( $prev > 0 ) {
+                               $link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
+
+                               /** This filter is documented in wp-includes/post-template.php */
+                               $output .= apply_filters( 'wp_link_pages_link', $link, $prev );
+                       }
+                       $next = $page + 1;
+                       if ( $next <= $numpages ) {
+                               if ( $prev ) {
+                                       $output .= $r['separator'];

                                }
                                }

-                               $output .= $after;
+                               $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 .= $r['after'];

                }
        }
 
                }
        }
 

-       if ( $echo )
-               echo $output;
+       /**
+        * Filter the HTML output of page links for paginated posts.
+        *
+        * @since 3.6.0
+        *
+        * @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 );

 
 

-       return $output;
+       if ( $r['echo'] ) {
+               echo $html;
+       }
+       return $html;

 }
 
 /**
 }
 
 /**


@@ -677,11 +900,15 @@ function wp_link_pages($args = '') {
  * @since 3.1.0
  * @access private
  *
  * @since 3.1.0
  * @access private
  *

+ * @global WP_Rewrite $wp_rewrite
+ *

  * @param int $i Page number.
  * @return string Link.
  */
 function _wp_link_page( $i ) {
  * @param int $i Page number.
  * @return string Link.
  */
 function _wp_link_page( $i ) {

-       global $post, $wp_rewrite;
+       global $wp_rewrite;
+       $post = get_post();
+       $query_args = array();

 
        if ( 1 == $i ) {
                $url = get_permalink();
 
        if ( 1 == $i ) {
                $url = get_permalink();


@@ -694,6 +921,16 @@ function _wp_link_page( $i ) {
                        $url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
        }
 
                        $url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
        }
 

+       if ( is_preview() ) {
+
+               if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
+                       $query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
+                       $query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
+               }
+
+               $url = get_preview_post_link( $post, $query_args, $url );
+       }
+

        return '<a href="' . esc_url( $url ) . '">';
 }
 
        return '<a href="' . esc_url( $url ) . '">';
 }
 


@@ -707,7 +944,7 @@ function _wp_link_page( $i ) {
  * @since 1.5.0
  *
  * @param string $key Meta data key name.
  * @since 1.5.0
  *
  * @param string $key Meta data key name.

- * @return bool|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist.
+ * @return false|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist.

  */
 function post_custom( $key = '' ) {
        $custom = get_post_custom();
  */
 function post_custom( $key = '' ) {
        $custom = get_post_custom();


@@ -723,20 +960,31 @@ function post_custom( $key = '' ) {
 /**
  * Display list of post custom fields.
  *
 /**
  * Display list of post custom fields.
  *

- * @internal This will probably change at some point...

  * @since 1.2.0
  * @since 1.2.0

- * @uses apply_filters() Calls 'the_meta_key' on list item HTML content, with key and value as separate parameters.
+ *
+ * @internal This will probably change at some point...
+ *

  */
 function the_meta() {
        if ( $keys = get_post_custom_keys() ) {
                echo "<ul class='post-meta'>\n";
                foreach ( (array) $keys as $key ) {
                        $keyt = trim($key);
  */
 function the_meta() {
        if ( $keys = get_post_custom_keys() ) {
                echo "<ul class='post-meta'>\n";
                foreach ( (array) $keys as $key ) {
                        $keyt = trim($key);

-                       if ( '_' == $keyt[0] )
+                       if ( is_protected_meta( $keyt, 'post' ) )

                                continue;
                        $values = array_map('trim', get_post_custom_values($key));
                        $value = implode($values,', ');
                                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";
        }
                }
                echo "</ul>\n";
        }


@@ -750,45 +998,83 @@ function the_meta() {
  * Retrieve or display list of pages as a dropdown (select list).
  *
  * @since 2.1.0
  * Retrieve or display list of pages as a dropdown (select list).
  *
  * @since 2.1.0

- *
- * @param array|string $args Optional. Override default arguments.
+ * @since 4.2.0 The `$value_field` argument was added.
+ * @since 4.3.0 The `$class` argument was added.
+ *
+ * @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.
+ *     @type string       $class                 Value for the 'class' attribute of the select element. Default: none.
+ *                                               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.
  */
  * @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' => '',
        $defaults = array(
                'depth' => 0, 'child_of' => 0,
                'selected' => 0, 'echo' => 1,
                'name' => 'page_id', 'id' => '',

+               'class' => '',

                'show_option_none' => '', 'show_option_no_change' => '',
                'show_option_none' => '', 'show_option_no_change' => '',

-               'option_none_value' => ''
+               'option_none_value' => '',
+               'value_field' => 'ID',

        );
 
        $r = wp_parse_args( $args, $defaults );
        );
 
        $r = wp_parse_args( $args, $defaults );

-       extract( $r, EXTR_SKIP );

 
 

-       $pages = get_pages($r);
+       $pages = get_pages( $r );

        $output = '';
        $output = '';

-       $name = esc_attr($name);

        // Back-compat with old system where both id and name were based on $name argument
        // Back-compat with old system where both id and name were based on $name argument

-       if ( empty($id) )
-               $id = $name;
-
-       if ( ! empty($pages) ) {
-               $output = "<select name=\"$name\" id=\"$id\">\n";
-               if ( $show_option_no_change )
-                       $output .= "\t<option value=\"-1\">$show_option_no_change</option>";
-               if ( $show_option_none )
-                       $output .= "\t<option value=\"" . esc_attr($option_none_value) . "\">$show_option_none</option>\n";
-               $output .= walk_page_dropdown_tree($pages, $depth, $r);
-               $output .= "</select>\n";
+       if ( empty( $r['id'] ) ) {
+               $r['id'] = $r['name'];

        }
 
        }
 

-       $output = apply_filters('wp_dropdown_pages', $output);
+       if ( ! empty( $pages ) ) {
+               $class = '';
+               if ( ! empty( $r['class'] ) ) {
+                       $class = " class='" . esc_attr( $r['class'] ) . "'";
+               }

 
 

-       if ( $echo )
-               echo $output;
+               $output = "<select name='" . esc_attr( $r['name'] ) . "'" . $class . " id='" . esc_attr( $r['id'] ) . "'>\n";
+               if ( $r['show_option_no_change'] ) {
+                       $output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
+               }
+               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";
+       }

 
 

-       return $output;
+       /**
+        * Filter the HTML output of a list of pages as a drop down.
+        *
+        * @since 2.1.0
+        * @since 4.4.0 `$r` and `$pages` added as arguments.
+        *
+        * @param string $output HTML output for drop down list of pages.
+        * @param array  $r      The parsed arguments array.
+        * @param array  $pages  List of WP_Post objects returned by `get_pages()`
+        */
+       $html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
+
+       if ( $r['echo'] ) {
+               echo $html;
+       }
+       return $html;

 }
 
 /**
 }
 
 /**


@@ -796,55 +1082,112 @@ function wp_dropdown_pages($args = '') {
  *
  * @since 1.5.0
  *
  *
  * @since 1.5.0
  *

- * @param array|string $args Optional. Override default arguments.
- * @return string HTML content, if not displaying.
+ * @see get_pages()
+ *
+ * @global WP_Query $wp_query
+ *
+ * @param array|string $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|void HTML list of pages.

  */
  */

-function wp_list_pages($args = '') {
+function wp_list_pages( $args = '' ) {

        $defaults = array(
                'depth' => 0, 'show_date' => '',
        $defaults = array(
                'depth' => 0, 'show_date' => '',

-               'date_format' => get_option('date_format'),
+               'date_format' => get_option( 'date_format' ),

                'child_of' => 0, 'exclude' => '',
                '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 );
                '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
 
        $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)
 
        // 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();
-       $r['exclude'] = implode( ',', apply_filters('wp_list_pages_excludes', $exclude_array) );
+       $exclude_array = ( $r['exclude'] ) ? explode( ',', $r['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;
 
        // Query pages.
        $r['hierarchical'] = 0;

-       $pages = get_pages($r);
+       $pages = get_pages( $r );

 
 

-       if ( !empty($pages) ) {
-               if ( $r['title_li'] )
+       if ( ! empty( $pages ) ) {
+               if ( $r['title_li'] ) {

                        $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
                        $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';

-
+               }

                global $wp_query;
                global $wp_query;

-               if ( is_page() || is_attachment() || $wp_query->is_posts_page )
-                       $current_page = $wp_query->get_queried_object_id();
-               $output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
+               if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
+                       $current_page = get_queried_object_id();
+               } elseif ( is_singular() ) {
+                       $queried_object = get_queried_object();
+                       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'] )
+               if ( $r['title_li'] ) {

                        $output .= '</ul></li>';
                        $output .= '</ul></li>';

+               }

        }
 
        }
 

-       $output = apply_filters('wp_list_pages', $output, $r);
+       /**
+        * Filter the HTML output of the pages to list.
+        *
+        * @since 1.5.1
+        * @since 4.4.0 `$pages` added as arguments.
+        *
+        * @see wp_list_pages()
+        *
+        * @param string $output HTML output of the pages list.
+        * @param array  $r      An array of page-listing arguments.
+        * @param array  $pages  List of WP_Post objects returned by `get_pages()`
+        */
+       $html = apply_filters( 'wp_list_pages', $output, $r, $pages );

 
 

-       if ( $r['echo'] )
-               echo $output;
-       else
-               return $output;
+       if ( $r['echo'] ) {
+               echo $html;
+       } else {
+               return $html;
+       }

 }
 
 /**
 }
 
 /**


@@ -854,27 +1197,53 @@ function wp_list_pages($args = '') {
  * wp_list_pages()} function. Check that function for more info on those
  * arguments.
  *
  * 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 page 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
  * @since 2.7.0

- *
- * @param array|string $args
+ * @since 4.4.0 Added `menu_id`, `container`, `before`, `after`, and `walker` arguments.
+ *
+ * @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_id     ID for the div containing the page list. Default is empty string.
+ *     @type string          $menu_class  Class to use for the element containing the page list. Default 'menu'.
+ *     @type string          $container   Element to use for the element containing the page list. Default 'div'.
+ *     @type bool            $echo        Whether to echo the list or return it. Accepts true (echo) or false (return).
+ *                                        Default true.
+ *     @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'.
+ *     @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 string          $before      The HTML or text to prepend to the menu. Default is '<ul>'.
+ *     @type string          $after       The HTML or text to append to the menu. Default is '</ul>'.
+ *     @type Walker          $walker      Walker instance to use for listing pages. Default empty (Walker_Page).
+ * }
+ * @return string|void HTML menu

  */
 function wp_page_menu( $args = array() ) {
  */
 function wp_page_menu( $args = array() ) {

-       $defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
+       $defaults = array(
+               'sort_column' => 'menu_order, post_title',
+               'menu_id'     => '',
+               'menu_class'  => 'menu',
+               'container'   => 'div',
+               'echo'        => true,
+               'link_before' => '',
+               'link_after'  => '',
+               'before'      => '<ul>',
+               'after'       => '</ul>',
+               'walker'      => '',
+       );

        $args = wp_parse_args( $args, $defaults );
        $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 = '';
        $args = apply_filters( 'wp_page_menu_args', $args );
 
        $menu = '';


@@ -890,7 +1259,7 @@ function wp_page_menu( $args = array() ) {
                $class = '';
                if ( is_front_page() && !is_paged() )
                        $class = 'class="current_page_item"';
                $class = '';
                if ( is_front_page() && !is_paged() )
                        $class = 'class="current_page_item"';

-               $menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '" title="' . esc_attr($text) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
+               $menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';

                // If the front page is a page, add it to the exclude list
                if (get_option('show_on_front') == 'page') {
                        if ( !empty( $list_args['exclude'] ) ) {
                // If the front page is a page, add it to the exclude list
                if (get_option('show_on_front') == 'page') {
                        if ( !empty( $list_args['exclude'] ) ) {


@@ -906,10 +1275,47 @@ function wp_page_menu( $args = array() ) {
        $list_args['title_li'] = '';
        $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
 
        $list_args['title_li'] = '';
        $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
 

-       if ( $menu )
-               $menu = '<ul>' . $menu . '</ul>';
+       $container = sanitize_text_field( $args['container'] );
+
+       // Fallback in case `wp_nav_menu()` was called without a container.
+       if ( empty( $container ) ) {
+               $container = 'div';
+       }
+
+       if ( $menu ) {
+
+               // wp_nav_menu doesn't set before and after
+               if ( isset( $args['fallback_cb'] ) &&
+                       'wp_page_menu' === $args['fallback_cb'] &&
+                       'ul' !== $container ) {
+                       $args['before'] = '<ul>';
+                       $args['after'] = '</ul>';
+               }
+
+               $menu = $args['before'] . $menu . $args['after'];
+       }
+
+       $attrs = '';
+       if ( ! empty( $args['menu_id'] ) ) {
+               $attrs .= ' id="' . esc_attr( $args['menu_id'] ) . '"';
+       }

 
 

-       $menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+       if ( ! empty( $args['menu_class'] ) ) {
+               $attrs .= ' class="' . esc_attr( $args['menu_class'] ) . '"';
+       }
+
+       $menu = "<{$container}{$attrs}>" . $menu . "</{$container}>\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;
        $menu = apply_filters( 'wp_page_menu', $menu, $args );
        if ( $args['echo'] )
                echo $menu;


@@ -926,16 +1332,26 @@ function wp_page_menu( $args = array() ) {
  *
  * @uses Walker_Page to create HTML list content.
  * @since 2.1.0
  *
  * @uses Walker_Page to create HTML list content.
  * @since 2.1.0

- * @see Walker_Page::walk() for parameters and return description.
+ *
+ * @param array $pages
+ * @param int   $depth
+ * @param int   $current_page
+ * @param array $r
+ * @return string

  */
  */

-function walk_page_tree($pages, $depth, $current_page, $r) {
+function walk_page_tree( $pages, $depth, $current_page, $r ) {

        if ( empty($r['walker']) )
                $walker = new Walker_Page;
        else
                $walker = $r['walker'];
 
        if ( empty($r['walker']) )
                $walker = new Walker_Page;
        else
                $walker = $r['walker'];
 

+       foreach ( (array) $pages as $page ) {
+               if ( $page->post_parent )
+                       $r['pages_with_children'][ $page->post_parent ] = true;
+       }
+

        $args = array($pages, $depth, $r, $current_page);
        $args = array($pages, $depth, $r, $current_page);

-       return call_user_func_array(array(&$walker, 'walk'), $args);
+       return call_user_func_array(array($walker, 'walk'), $args);

 }
 
 /**
 }
 
 /**


@@ -944,6 +1360,8 @@ function walk_page_tree($pages, $depth, $current_page, $r) {
  * @uses Walker_PageDropdown to create HTML dropdown content.
  * @since 2.1.0
  * @see Walker_PageDropdown::walk() for parameters and return description.
  * @uses Walker_PageDropdown to create HTML dropdown content.
  * @since 2.1.0
  * @see Walker_PageDropdown::walk() for parameters and return description.

+ *
+ * @return string

  */
 function walk_page_dropdown_tree() {
        $args = func_get_args();
  */
 function walk_page_dropdown_tree() {
        $args = func_get_args();


@@ -952,159 +1370,7 @@ function walk_page_dropdown_tree() {
        else
                $walker = $args[2]['walker'];
 
        else
                $walker = $args[2]['walker'];
 

-       return call_user_func_array(array(&$walker, 'walk'), $args);
-}
-
-/**
- * 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';
-
-       /**
-        * @see Walker::$db_fields
-        * @since 2.1.0
-        * @todo Decouple this.
-        * @var array
-        */
-       var $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.
-        */
-       function start_lvl(&$output, $depth) {
-               $indent = str_repeat("\t", $depth);
-               $output .= "\n$indent<ul class='children'>\n";
-       }
-
-       /**
-        * @see Walker::end_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.
-        */
-       function end_lvl(&$output, $depth) {
-               $indent = str_repeat("\t", $depth);
-               $output .= "$indent</ul>\n";
-       }
-
-       /**
-        * @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 int $depth Depth of page. Used for padding.
-        * @param int $current_page Page ID.
-        * @param array $args
-        */
-       function start_el(&$output, $page, $depth, $args, $current_page) {
-               if ( $depth )
-                       $indent = str_repeat("\t", $depth);
-               else
-                       $indent = '';
-
-               extract($args, EXTR_SKIP);
-               $css_class = array('page_item', 'page-item-'.$page->ID);
-               if ( !empty($current_page) ) {
-                       $_current_page = get_page( $current_page );
-                       _get_post_ancestors($_current_page);
-                       if ( isset($_current_page->ancestors) && in_array($page->ID, (array) $_current_page->ancestors) )
-                               $css_class[] = 'current_page_ancestor';
-                       if ( $page->ID == $current_page )
-                               $css_class[] = 'current_page_item';
-                       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));
-
-               $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_permalink($page->ID) . '" title="' . esc_attr( wp_strip_all_tags( apply_filters( 'the_title', $page->post_title, $page->ID ) ) ) . '">' . $link_before . apply_filters( 'the_title', $page->post_title, $page->ID ) . $link_after . '</a>';
-
-               if ( !empty($show_date) ) {
-                       if ( 'modified' == $show_date )
-                               $time = $page->post_modified;
-                       else
-                               $time = $page->post_date;
-
-                       $output .= " " . mysql2date($date_format, $time);
-               }
-       }
-
-       /**
-        * @see Walker::end_el()
-        * @since 2.1.0
-        *
-        * @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.
-        */
-       function end_el(&$output, $page, $depth) {
-               $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';
-
-       /**
-        * @see Walker::$db_fields
-        * @since 2.1.0
-        * @todo Decouple this
-        * @var array
-        */
-       var $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 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.
-        */
-       function start_el(&$output, $page, $depth, $args) {
-               $pad = str_repeat('&nbsp;', $depth * 3);
-
-               $output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
-               if ( $page->ID == $args['selected'] )
-                       $output .= ' selected="selected"';
-               $output .= '>';
-               $title = esc_html($page->post_title);
-               $title = apply_filters( 'list_pages', $page->post_title );
-               $output .= "$pad$title";
-               $output .= "</option>\n";
-       }
+       return call_user_func_array(array($walker, 'walk'), $args);

 }
 
 //
 }
 
 //


@@ -1116,10 +1382,10 @@ class Walker_PageDropdown extends Walker {
  *
  * @since 2.0.0
  *
  *
  * @since 2.0.0
  *

- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default is false. Whether to use full size.
- * @param bool $deprecated Deprecated. Not used.
- * @param bool $permalink Optional, default is false. Whether to include permalink.
+ * @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        $deprecated   Deprecated. Not used.
+ * @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 ) )
  */
 function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
        if ( !empty( $deprecated ) )


@@ -1135,61 +1401,99 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $
  * Retrieve an attachment page link using an image or icon, if possible.
  *
  * @since 2.5.0
  * 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 $id Optional. Post ID.
- * @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 $icon Optional, default is false. Whether to include icon.
- * @param string $text Optional, default is false. If string, then will be link text.
+ * @since 4.4.0 The `$id` parameter can now accept either a post ID or `WP_Post` object.
+ *
+ * @param int|WP_Post  $id        Optional. Post ID or post object.
+ * @param string|array $size      Optional. Image size. Accepts any valid image size, or an array
+ *                                of width and height values in pixels (in that order).
+ *                                Default 'thumbnail'.
+ * @param bool         $permalink Optional, Whether to add permalink to image. Default false.
+ * @param bool         $icon      Optional. Whether the attachment is an icon. Default false.
+ * @param string|false $text      Optional. Link text to use. Activated by passing a string, false otherwise.
+ *                                Default false.
+ * @param array|string $attr      Optional. Array or string of attributes. Default empty.

  * @return string HTML content.
  */
  * @return string HTML content.
  */

-function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false) {
-       $id = intval($id);
-       $_post = & get_post( $id );
+function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
+       $_post = get_post( $id );

 
 

-       if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-               return __('Missing Attachment');
+       if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
+               return __( 'Missing Attachment' );

 
        if ( $permalink )
 
        if ( $permalink )

-               $url = get_attachment_link($_post->ID);
-
-       $post_title = esc_attr($_post->post_title);
+               $url = get_attachment_link( $_post->ID );

 
        if ( $text ) {
 
        if ( $text ) {

-               $link_text = esc_attr($text);
-       } elseif ( ( is_int($size) && $size != 0 ) or ( is_string($size) && $size != 'none' ) or $size != false ) {
-               $link_text = wp_get_attachment_image($id, $size, $icon);
+               $link_text = $text;
+       } elseif ( $size && 'none' != $size ) {
+               $link_text = wp_get_attachment_image( $_post->ID, $size, $icon, $attr );

        } else {
                $link_text = '';
        }
 
        } else {
                $link_text = '';
        }
 

-       if( trim($link_text) == '' )
+       if ( trim( $link_text ) == '' )

                $link_text = $_post->post_title;
 
                $link_text = $_post->post_title;
 

-       return apply_filters( 'wp_get_attachment_link', "<a href='$url' title='$post_title'>$link_text</a>", $id, $size, $permalink, $icon, $text );
+       /**
+        * 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|array $size      Size of the image. Image size or array of width and height values (in that order).
+        *                                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
  *
  * @since 2.0.0

- * @uses apply_filters() Calls 'prepend_attachment' hook on HTML content.

  *
  * @param string $content
  * @return string
  */
 function prepend_attachment($content) {
  *
  * @param string $content
  * @return string
  */
 function prepend_attachment($content) {

-       global $post;
+       $post = get_post();

 
        if ( empty($post->post_type) || $post->post_type != 'attachment' )
                return $content;
 
 
        if ( empty($post->post_type) || $post->post_type != 'attachment' )
                return $content;
 

-       $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>';
-       $p = apply_filters('prepend_attachment', $p);
+       if ( wp_attachment_is( 'video', $post ) ) {
+               $meta = wp_get_attachment_metadata( get_the_ID() );
+               $atts = array( 'src' => wp_get_attachment_url() );
+               if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+                       $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";
 }
 
        return "$p\n$content";
 }


@@ -1202,69 +1506,95 @@ function prepend_attachment($content) {
  * Retrieve protected post password form content.
  *
  * @since 1.0.0
  * 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. Post ID or WP_Post object. Default is global $post.

  * @return string HTML content for password form for password protected post.
  */
  * @return string HTML content for password form for password protected post.
  */

-function get_the_password_form() {
-       global $post;
-       $label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
-       $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
-       <p>' . __("This post 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>
-       </form>
+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></form>

        ';
        ';

-       return apply_filters('the_password_form', $output);
+
+       /**
+        * 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.
 }
 
 /**
  * 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
- * specific to that template.
+ * You can optionally provide a template name or array of template names
+ * and then the check will be specific to that template.

  *
  * @since 2.5.0
  *
  * @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.
- * @return bool False on failure, true if success.
+ * @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()) {
+function is_page_template( $template = '' ) {
+       if ( ! is_page() )

                return false;
                return false;

-       }

 
 

-       global $wp_query;
+       $page_template = get_page_template_slug( get_queried_object_id() );
+
+       if ( empty( $template ) )
+               return (bool) $page_template;

 
 

-       $page = $wp_query->get_queried_object();
-       $custom_fields = get_post_custom_values('_wp_page_template',$page->ID);
-       $page_template = $custom_fields[0];
+       if ( $template == $page_template )
+               return true;

 
 

-       // We have no argument passed so just see if a page_template has been specified
-       if ( empty( $template ) ) {
-               if (!empty( $page_template ) ) {
+       if ( is_array( $template ) ) {
+               if ( ( in_array( 'default', $template, true ) && ! $page_template )
+                       || in_array( $page_template, $template, true )
+               ) {

                        return true;
                }
                        return true;
                }

-       } elseif ( $template == $page_template) {
-               return true;

        }
 
        }
 

-       return false;
+       return ( 'default' === $template && ! $page_template );
+}
+
+/**
+ * Get the specific template name for a page.
+ *
+ * @since 3.4.0
+ *
+ * @param int $post_id Optional. The page ID to check. Defaults to the current post, when used in the loop.
+ * @return string|false Page template filename. Returns an empty string when the default page template
+ *     is in use. Returns false if the post is not a page.
+ */
+function get_page_template_slug( $post_id = null ) {
+       $post = get_post( $post_id );
+       if ( ! $post || 'page' != $post->post_type )
+               return false;
+       $template = get_post_meta( $post->ID, '_wp_page_template', true );
+       if ( ! $template || 'default' == $template )
+               return '';
+       return $template;

 }
 
 /**
  * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
  *
 }
 
 /**
  * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
  *

- * @package WordPress
- * @subpackage Post_Revisions

  * @since 2.6.0
  *
  * @since 2.6.0
  *

- * @uses date_i18n()
- *

  * @param int|object $revision Revision ID or revision object.
  * @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'.
+ * @param bool       $link     Optional, default is true. Link to revisions's page?
+ * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.

  */
 function wp_post_revision_title( $revision, $link = true ) {
        if ( !$revision = get_post( $revision ) )
  */
 function wp_post_revision_title( $revision, $link = true ) {
        if ( !$revision = get_post( $revision ) )


@@ -1274,11 +1604,11 @@ function wp_post_revision_title( $revision, $link = true ) {
                return false;
 
        /* translators: revision date format, see http://php.net/date */
                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 */
        /* translators: 1: date */

-       $autosavef = __( '%1$s [Autosave]' );
+       $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );

        /* translators: 1: date */
        /* translators: 1: date */

-       $currentf  = __( '%1$s [Current Revision]' );
+       $currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );

 
        $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
        if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
 
        $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
        if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )


@@ -1292,145 +1622,101 @@ function wp_post_revision_title( $revision, $link = true ) {
        return $date;
 }
 
        return $date;
 }
 

+/**
+ * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
+ *
+ * @since 3.6.0
+ *
+ * @param int|object $revision Revision ID or revision object.
+ * @param bool       $link     Optional, default is true. Link to revisions's page?
+ * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
+ */
+function wp_post_revision_title_expanded( $revision, $link = true ) {
+       if ( !$revision = get_post( $revision ) )
+               return $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( '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 ) )
+               $date = "<a href='$link'>$date</a>";
+
+       $revision_date_author = sprintf(
+               /* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
+               _x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
+               $gravatar,
+               $author,
+               human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
+               $date
+       );
+
+       $autosavef = __( '%1$s [Autosave]' );
+       $currentf  = __( '%1$s [Current Revision]' );
+
+       if ( !wp_is_post_revision( $revision ) )
+               $revision_date_author = sprintf( $currentf, $revision_date_author );
+       elseif ( wp_is_post_autosave( $revision ) )
+               $revision_date_author = sprintf( $autosavef, $revision_date_author );
+
+       /**
+        * Filter the formatted author and date for a revision.
+        *
+        * @since 4.4.0
+        *
+        * @param string  $revision_date_author The formatted string.
+        * @param WP_Post $revision             The revision object.
+        * @param bool    $link                 Whether to link to the revisions page, as passed into
+        *                                      wp_post_revision_title_expanded().
+        */
+       return apply_filters( 'wp_post_revision_title_expanded', $revision_date_author, $revision, $link );
+}
+

 /**
  * 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.
  *
 /**
  * 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.
  *

- * Second argument controls parameters:
- *   (bool)   parent : include the parent (the "Current Revision") in the list.
- *   (string) format : 'list' or 'form-table'.  'list' outputs UL, 'form-table'
- *                     outputs TABLE with UI.
- *   (int)    right  : what revision is currently being viewed - used in
- *                     form-table format.
- *   (int)    left   : what revision is currently being diffed against right -
- *                     used in form-table format.
- *
- * @package WordPress
- * @subpackage Post_Revisions

  * @since 2.6.0
  *
  * @since 2.6.0
  *

- * @uses wp_get_post_revisions()
- * @uses wp_post_revision_title()
- * @uses get_edit_post_link()
- * @uses get_the_author_meta()
- *
- * @todo split into two functions (list, form-table) ?
- *
- * @param int|object $post_id Post ID or post object.
- * @param string|array $args See description {@link wp_parse_args()}.
- * @return null
+ * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param string      $type    'all' (default), 'revision' or 'autosave'

  */
  */

-function wp_list_post_revisions( $post_id = 0, $args = null ) {
-       if ( !$post = get_post( $post_id ) )
+function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
+       if ( ! $post = get_post( $post_id ) )

                return;
 
                return;
 

-       $defaults = array( 'parent' => false, 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' );
-       extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
-
-       switch ( $type ) {
-               case 'autosave' :
-                       if ( !$autosave = wp_get_post_autosave( $post->ID ) )
-                               return;
-                       $revisions = array( $autosave );
-                       break;
-               case 'revision' : // just revisions - remove autosave later
-               case 'all' :
-               default :
-                       if ( !$revisions = wp_get_post_revisions( $post->ID ) )
-                               return;
-                       break;
+       // $args array with (parent, format, right, left, type) deprecated since 3.6
+       if ( is_array( $type ) ) {
+               $type = ! empty( $type['type'] ) ? $type['type']  : $type;
+               _deprecated_argument( __FUNCTION__, '3.6' );

        }
 
        }
 

-       /* translators: post revision: 1: when, 2: author name */
-       $titlef = _x( '%1$s by %2$s', 'post revision' );
-
-       if ( $parent )
-               array_unshift( $revisions, $post );
+       if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+               return;

 
        $rows = '';
 
        $rows = '';

-       $class = false;
-       $can_edit_post = current_user_can( 'edit_post', $post->ID );

        foreach ( $revisions as $revision ) {
        foreach ( $revisions as $revision ) {

-               if ( !current_user_can( 'read_post', $revision->ID ) )
+               if ( ! current_user_can( 'read_post', $revision->ID ) )

                        continue;
                        continue;

-               if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
+
+               $is_autosave = wp_is_post_autosave( $revision );
+               if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )

                        continue;
 
                        continue;
 

-               $date = wp_post_revision_title( $revision );
-               $name = get_the_author_meta( 'display_name', $revision->post_author );
-
-               if ( 'form-table' == $format ) {
-                       if ( $left )
-                               $left_checked = $left == $revision->ID ? ' checked="checked"' : '';
-                       else
-                               $left_checked = $right_checked ? ' checked="checked"' : ''; // [sic] (the next one)
-                       $right_checked = $right == $revision->ID ? ' checked="checked"' : '';
-
-                       $class = $class ? '' : " class='alternate'";
-
-                       if ( $post->ID != $revision->ID && $can_edit_post )
-                               $actions = '<a href="' . wp_nonce_url( add_query_arg( array( 'revision' => $revision->ID, 'action' => 'restore' ) ), "restore-post_$post->ID|$revision->ID" ) . '">' . __( 'Restore' ) . '</a>';
-                       else
-                               $actions = '';
-
-                       $rows .= "<tr$class>\n";
-                       $rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='left' value='$revision->ID'$left_checked /></th>\n";
-                       $rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='right' value='$revision->ID'$right_checked /></th>\n";
-                       $rows .= "\t<td>$date</td>\n";
-                       $rows .= "\t<td>$name</td>\n";
-                       $rows .= "\t<td class='action-links'>$actions</td>\n";
-                       $rows .= "</tr>\n";
-               } else {
-                       $title = sprintf( $titlef, $date, $name );
-                       $rows .= "\t<li>$title</li>\n";
-               }
+               $rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";

        }
 
        }
 

-       if ( 'form-table' == $format ) : ?>
-
-<form action="revision.php" method="get">
-
-<div class="tablenav">
-       <div class="alignleft">
-               <input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Compare Revisions' ); ?>" />
-               <input type="hidden" name="action" value="diff" />
-               <input type="hidden" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
-       </div>
-</div>
-
-<br class="clear" />
-
-<table class="widefat post-revisions" cellspacing="0" id="post-revisions">
-       <col />
-       <col />
-       <col style="width: 33%" />
-       <col style="width: 33%" />
-       <col style="width: 33%" />
-<thead>
-<tr>
-       <th scope="col"><?php /* translators: column name in revisons */ _ex( 'Old', 'revisions column name' ); ?></th>
-       <th scope="col"><?php /* translators: column name in revisons */ _ex( 'New', 'revisions column name' ); ?></th>
-       <th scope="col"><?php /* translators: column name in revisons */ _ex( 'Date Created', 'revisions column name' ); ?></th>
-       <th scope="col"><?php _e( 'Author' ); ?></th>
-       <th scope="col" class="action-links"><?php _e( 'Actions' ); ?></th>
-</tr>
-</thead>
-<tbody>
-
-<?php echo $rows; ?>
-
-</tbody>
-</table>
-
-</form>
-
-<?php
-       else :
-               echo "<ul class='post-revisions'>\n";
-               echo $rows;
-               echo "</ul>";
-       endif;
+       echo "<div class='hide-if-js'><p>" . __( 'JavaScript must be enabled to use this feature.' ) . "</p></div>\n";

 
 

+       echo "<ul class='post-revisions hide-if-no-js'>\n";
+       echo $rows;
+       echo "</ul>";

 }
 }