summaryrefslogtreecommitdiffstats
path: root/wp-includes/category-template.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-02-15 13:19:12 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-02-15 13:19:12 +0000
commit8752f7651d737da0dbe86065e708347a58b40d61 (patch)
treeac80c1eb849760d123d729ffb33fb8a9dc1742db /wp-includes/category-template.php
parent982f28611561556403f1c1004ad41f3253205e0e (diff)
downloadwordpress-mu-8752f7651d737da0dbe86065e708347a58b40d61.tar.gz
wordpress-mu-8752f7651d737da0dbe86065e708347a58b40d61.tar.xz
wordpress-mu-8752f7651d737da0dbe86065e708347a58b40d61.zip
WP Merge to rev 4887
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@888 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/category-template.php')
-rw-r--r--wp-includes/category-template.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 1ca0743..fed3043 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -35,10 +35,10 @@ function get_category_link($category_id) {
$category->category_parent = 0;
if ( $parent = $category->category_parent )
- $category_nicename = get_category_parents($parent, false, '/', true) . $category_nicename . '/';
+ $category_nicename = get_category_parents($parent, false, '/', true) . $category_nicename;
$catlink = str_replace('%category%', $category_nicename, $catlink);
- $catlink = get_option('home') . trailingslashit($catlink);
+ $catlink = get_option('home') . user_trailingslashit($catlink);
}
return apply_filters('category_link', $catlink, $category_id);
}