WordPress 4.1.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..ac613f396cd9325450c36eaec6e03e453ae5697a 100644 (file)
--- a/wp-includes/post-formats.php
+++ b/wp-includes/post-formats.php
@@ -32,23 +32,21 @@ function get_post_format( $post = null ) {
 }
 
 /**
- * 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.
  */