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

Fix category permalinks. Update cat_ID to term_id. fixes #4349 see #4189 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-05-28 18:47:08 +00:00
parent a438f8a92a
commit 6621b8eed0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/link-template.php
View File

@ -73,8 +73,8 @@ function get_permalink($id = 0) {
$category = ''; $category = '';
if (strpos($permalink, '%category%') !== false) { if (strpos($permalink, '%category%') !== false) {
$cats = get_the_category($post->ID); $cats = get_the_category($post->ID);
$category = $cats[0]->category_nicename; $category = $cats[0]->slug;
if ( $parent=$cats[0]->category_parent ) if ( $parent=$cats[0]->parent )
$category = get_category_parents($parent, FALSE, '/', TRUE) . $category; $category = get_category_parents($parent, FALSE, '/', TRUE) . $category;
} }
@ -359,9 +359,9 @@ function get_previous_post($in_same_cat = false, $excluded_categories = '') {
if ( $in_same_cat ) { if ( $in_same_cat ) {
$join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id "; $join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id ";
$cat_array = get_the_category($post->ID); $cat_array = get_the_category($post->ID);
$join .= ' AND (category_id = ' . intval($cat_array[0]->cat_ID); $join .= ' AND (category_id = ' . intval($cat_array[0]->term_id);
for ( $i = 1; $i < (count($cat_array)); $i++ ) { for ( $i = 1; $i < (count($cat_array)); $i++ ) {
$join .= ' OR category_id = ' . intval($cat_array[$i]->cat_ID); $join .= ' OR category_id = ' . intval($cat_array[$i]->term_id);
} }
$join .= ')'; $join .= ')';
} }
@ -396,9 +396,9 @@ function get_next_post($in_same_cat = false, $excluded_categories = '') {
if ( $in_same_cat ) { if ( $in_same_cat ) {
$join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id "; $join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id ";
$cat_array = get_the_category($post->ID); $cat_array = get_the_category($post->ID);
$join .= ' AND (category_id = ' . intval($cat_array[0]->cat_ID); $join .= ' AND (category_id = ' . intval($cat_array[0]->term_id);
for ( $i = 1; $i < (count($cat_array)); $i++ ) { for ( $i = 1; $i < (count($cat_array)); $i++ ) {
$join .= ' OR category_id = ' . intval($cat_array[$i]->cat_ID); $join .= ' OR category_id = ' . intval($cat_array[$i]->term_id);
} }
$join .= ')'; $join .= ')';
} }