WordPress 4.2.4-scripts

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

diff --git a/wp-includes/post-formats.php b/wp-includes/post-formats.php
index a13de3eaa6dcae552c16cfd83863df4a4b8da90b..94a38581c5eea61711a577e1848555dbd67c59c8 100644 (file)
--- a/wp-includes/post-formats.php
+++ b/wp-includes/post-formats.php
@@ -26,29 +26,27 @@ function get_post_format( $post = null ) {
        if ( empty( $_format ) )
                return false;
 
-       $format = array_shift( $_format );
+       $format = reset( $_format );
 
        return str_replace('post-format-', '', $format->slug );
 }
 
 /**
- * Check if a post has a particular format
+ * Check if a post has any of the given formats, or any format.
  *
  * @since 3.1.0
  *
- * @uses has_term()
- *
- * @param string|array $format The format or formats to check.
- * @param object|int   $post   The post to check. If not supplied, defaults to the current post if used in the loop.
- * @return bool True if the post has the format, false otherwise.
+ * @param string|array $format Optional. The format or formats to check.
+ * @param object|int $post Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
+ * @return bool True if the post has any of the given formats (or any format, if no format specified), false otherwise.
  */
-function has_post_format( $format, $post = null ) {
-       if ( ! is_array( $format ) )
-               $format = array( $format );
-
+function has_post_format( $format = array(), $post = null ) {
        $prefixed = array();
-       foreach( $format as $single ) {
-               $prefixed[] = 'post-format-' . sanitize_key( $single );
+
+       if ( $format ) {
+               foreach ( (array) $format as $single ) {
+                       $prefixed[] = 'post-format-' . sanitize_key( $single );
+               }
        }
 
        return has_term( $prefixed, 'post_format', $post );
@@ -108,8 +106,6 @@ function get_post_format_strings() {
  *
  * @since 3.1.0
  *
- * @uses get_post_format_strings()
- *
  * @return array The array of post format slugs.
  */
 function get_post_format_slugs() {
@@ -122,8 +118,6 @@ function get_post_format_slugs() {
  *
  * @since 3.1.0
  *
- * @uses get_post_format_strings()
- *
  * @param string $slug A post format slug.
  * @return string The translated post format name.
  */
@@ -167,7 +161,6 @@ function _post_format_request( $qvs ) {
                $qvs['post_type'] = $tax->object_type;
        return $qvs;
 }
-add_filter( 'request', '_post_format_request' );
 
 /**
  * Filters the post format term link to remove the format prefix.
@@ -186,7 +179,6 @@ function _post_format_link( $link, $term, $taxonomy ) {
                return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
        }
 }
-add_filter( 'term_link', '_post_format_link', 10, 3 );
 
 /**
  * Remove the post format prefix from the name property of the term object created by get_term().
@@ -200,7 +192,6 @@ function _post_format_get_term( $term ) {
        }
        return $term;
 }
-add_filter( 'get_post_format', '_post_format_get_term' );
 
 /**
  * Remove the post format prefix from the name property of the term objects created by get_terms().
@@ -224,7 +215,6 @@ function _post_format_get_terms( $terms, $taxonomies, $args ) {
        }
        return $terms;
 }
-add_filter( 'get_terms', '_post_format_get_terms', 10, 3 );
 
 /**
  * Remove the post format prefix from the name property of the term objects created by wp_get_object_terms().
@@ -240,4 +230,3 @@ function _post_format_wp_get_object_terms( $terms ) {
        }
        return $terms;
 }
-add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );