Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Let `is_attachment()` accept an $attachment parameter, similar to `is_page()` and `is_single()`. Adds Unit Tests for all 3. 

Props alex-ye for the initial patch.
Fixes #24257.


Built from https://develop.svn.wordpress.org/trunk@27016


git-svn-id: http://core.svn.wordpress.org/trunk@26893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-01-22 22:31:12 +00:00
parent 4d531835a8
commit a9c661c00e
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wp-includes/query.php
View File

@ -175,9 +175,10 @@ function is_post_type_archive( $post_types = '' ) {
* @since 2.0.0
* @uses $wp_query
*
* @param mixed $attachment Attachment ID, title, slug, or array of such.
* @return bool
*/
function is_attachment() {
function is_attachment( $attachment = '' ) {
global $wp_query;
if ( ! isset( $wp_query ) ) {
@ -185,7 +186,7 @@ function is_attachment() {
return false;
}
return $wp_query->is_attachment();
return $wp_query->is_attachment( $attachment );
}
/**
@ -3387,10 +3388,30 @@ class WP_Query {
*
* @since 3.1.0
*
* @param mixed $attachment Attachment ID, title, slug, or array of such.
* @return bool
*/
function is_attachment() {
return (bool) $this->is_attachment;
function is_attachment( $attachment = '' ) {
if ( ! $this->is_attachment ) {
return false;
}
if ( empty( $attachment ) ) {
return true;
}
$attachment = (array) $attachment;
$post_obj = $this->get_queried_object();
if ( in_array( $post_obj->ID, $attachment ) ) {
return true;
} elseif ( in_array( $post_obj->post_title, $attachment ) ) {
return true;
} elseif ( in_array( $post_obj->post_name, $attachment ) ) {
return true;
}
return false;
}
/**