sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid infinite loop when category_parent equals cat_ID

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@4173 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2006-09-07 17:42:24 +00:00
parent 46526ab285
commit d51b58448f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/category-template.php
View File

@ -47,7 +47,7 @@ function get_category_parents($id, $link = FALSE, $separator = '/', $nicename =
else else
$name = $parent->cat_name; $name = $parent->cat_name;
if ( $parent->category_parent ) if ( $parent->category_parent && ($parent->category_parent != $parent->cat_ID) )
$chain .= get_category_parents($parent->category_parent, $link, $separator, $nicename); $chain .= get_category_parents($parent->category_parent, $link, $separator, $nicename);
if ( $link ) if ( $link )

5
wp-includes/category.php
View File

@ -172,7 +172,7 @@ function get_category_by_path($category_path, $full_match = true, $output = OBJE
foreach ($categories as $category) { foreach ($categories as $category) {
$path = '/' . $leaf_path; $path = '/' . $leaf_path;
$curcategory = $category; $curcategory = $category;
while ($curcategory->category_parent != 0) { while ( ($curcategory->category_parent != 0) && ($curcategory->category_parent != $curcategory->cat_ID) ) {
$curcategory = $wpdb->get_row("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE cat_ID = '$curcategory->category_parent'"); $curcategory = $wpdb->get_row("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE cat_ID = '$curcategory->category_parent'");
$path = '/' . $curcategory->category_nicename . $path; $path = '/' . $curcategory->category_nicename . $path;
} }
@ -219,6 +219,9 @@ function &_get_cat_children($category_id, $categories) {
$category_list = array(); $category_list = array();
foreach ( $categories as $category ) { foreach ( $categories as $category ) {
if ( $category->cat_ID == $category_id )
continue;
if ( $category->category_parent == $category_id ) { if ( $category->category_parent == $category_id ) {
$category_list[] = $category; $category_list[] = $category;
if ( $children = _get_cat_children($category->cat_ID, $categories) ) if ( $children = _get_cat_children($category->cat_ID, $categories) )