Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Move the clarification of is_tax() and WP_Query::is_tax() return value added in [37235] to @return description.

Browse Source 
Props DrewAPicture.
Fixes #36331.
Built from https://develop.svn.wordpress.org/trunk@37281


git-svn-id: http://core.svn.wordpress.org/trunk@37247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-04-21 17:47:28 +00:00
parent da08f6a3de
commit cf12011934
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/query.php
View File

@ -277,15 +277,13 @@ function is_tag( $tag = '' ) {
* this function will additionally check if the query is for one of the terms
* specified.
*
* Returns false for built-in taxonomies (category and tag archives).
*
* @since 2.5.0
*
* @global WP_Query $wp_query Global WP_Query instance.
*
* @param string|array $taxonomy Optional. Taxonomy slug or slugs.
* @param int|string|array $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
* @return bool
* @return bool True for custom taxonomy archive pages, false for built-in taxonomies (category and tag archives).
*/
function is_tax( $taxonomy = '', $term = '' ) {
global $wp_query;
@ -4342,15 +4340,13 @@ class WP_Query {
* this function will additionally check if the query is for one of the terms
* specified.
*
* Returns false for built-in taxonomies (category and tag archives).
*
* @since 3.1.0
*
* @global array $wp_taxonomies
*
* @param mixed $taxonomy Optional. Taxonomy slug or slugs.
* @param mixed $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
* @return bool
* @return bool True for custom taxonomy archive pages, false for built-in taxonomies (category and tag archives).
*/
public function is_tax( $taxonomy = '', $term = '' ) {
global $wp_taxonomies;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37280';
$wp_version = '4.6-alpha-37281';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.