vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-07 09:49:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rather than adding a taxonomy arg to get_category(), convert all uses of get_category() in core to get_term(). By doing so, we negate the need to call _make_cat_compat() in a few places that are only looking for a single property.

Browse Source 
Fixes #8722.



git-svn-id: https://develop.svn.wordpress.org/trunk@25662 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2013-10-02 19:58:50 +00:00
parent faa8c3c9ef
commit a27234c898
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-includes/category.php
View File

@@ -133,13 +133,19 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
$path = '/' . $curcategory->slug . $path;
}
if ( $path == $full_path )
return get_category( $category->term_id, $output );
if ( $path == $full_path ) {
$category = get_term( $category->term_id, 'category', $output );
_make_cat_compat( $category );
return $category;
}
}
// If full matching is not required, return the first cat that matches the leaf.
if ( ! $full_match )
return get_category( $categories[0]->term_id, $output );
if ( ! $full_match ) {
$category = get_term( reset( $categories )->term_id, 'category', $output );
_make_cat_compat( $category );
return $category;
}
return null;
}
@@ -185,7 +191,7 @@ function get_cat_ID( $cat_name ) {
*/
function get_cat_name( $cat_id ) {
$cat_id = (int) $cat_id;
$category = get_category( $cat_id );
$category = get_term( $cat_id, 'category' );
if ( ! $category || is_wp_error( $category ) )
return '';
return $category->name;