Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-24 17:21:34 +01:00
Code Issues Projects Releases Wiki Activity

In category.php:

Browse Source 
* Clarify some `return` docs.
* In `_make_cat_compat()`, ensure that `WP_Error` is not decorated

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32502 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-05-21 21:18:24 +00:00
parent 27522d1c00
commit ed4aafa692
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/category.php
View File

@ -68,7 +68,8 @@ function get_categories( $args = '' ) {
* @param int|object $category Category ID or Category row object * @param int|object $category Category ID or Category row object
* @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
* @param string $filter Optional. Default is raw or no WordPress defined filter will applied. * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
* @return object|array|WP_Error|null Category data in type defined by $output parameter. WP_Error if $category is empty, null if it does not exist. * @return object|array|WP_Error|null Category data in type defined by $output parameter.
* WP_Error if $category is empty, null if it does not exist.
*/ */
function get_category( $category, $output = OBJECT, $filter = 'raw' ) { function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
$category = get_term( $category, 'category', $output, $filter ); $category = get_term( $category, 'category', $output, $filter );
@ -98,7 +99,7 @@ function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
* @param string $category_path URL containing category slugs. * @param string $category_path URL containing category slugs.
* @param bool $full_match Optional. Whether full path should be matched. * @param bool $full_match Optional. Whether full path should be matched.
* @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
* @return null|object|array Null on failure. Type is based on $output value. * @return null|object|array|WP_Error Null on failure. Type is based on $output value.
*/ */
function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) { function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
$category_path = rawurlencode( urldecode( $category_path ) ); $category_path = rawurlencode( urldecode( $category_path ) );
@ -108,21 +109,23 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
$leaf_path = sanitize_title( basename( $category_paths ) ); $leaf_path = sanitize_title( basename( $category_paths ) );
$category_paths = explode( '/', $category_paths ); $category_paths = explode( '/', $category_paths );
$full_path = ''; $full_path = '';
foreach ( (array) $category_paths as $pathdir ) foreach ( (array) $category_paths as $pathdir ) {
$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir ); $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
}
$categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) ); $categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
if ( empty( $categories ) ) if ( empty( $categories ) ) {
return null; return;
}
foreach ( $categories as $category ) { foreach ( $categories as $category ) {
$path = '/' . $leaf_path; $path = '/' . $leaf_path;
$curcategory = $category; $curcategory = $category;
while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) { while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
$curcategory = get_term( $curcategory->parent, 'category' ); $curcategory = get_term( $curcategory->parent, 'category' );
if ( is_wp_error( $curcategory ) ) if ( is_wp_error( $curcategory ) ) {
return $curcategory; return $curcategory;
}
$path = '/' . $curcategory->slug . $path; $path = '/' . $curcategory->slug . $path;
} }
@ -139,8 +142,6 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
_make_cat_compat( $category ); _make_cat_compat( $category );
return $category; return $category;
} }
return null;
} }
/** /**
@ -321,7 +322,7 @@ function clean_category_cache( $id ) {
* @param array|object $category Category Row object or array * @param array|object $category Category Row object or array
*/ */
function _make_cat_compat( &$category ) { function _make_cat_compat( &$category ) {
if ( is_object( $category ) ) { if ( is_object( $category ) && ! is_wp_error( $category ) ) {
$category->cat_ID = &$category->term_id; $category->cat_ID = &$category->term_id;
$category->category_count = &$category->count; $category->category_count = &$category->count;
$category->category_description = &$category->description; $category->category_description = &$category->description;

2
wp-includes/version.php
View File

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