diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-09 15:17:25 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-09 15:17:25 +0000 |
| commit | 492aa4ee7086ed94cb2f37a2bce3b52905841659 (patch) | |
| tree | 825b6d0ae66246bae7a65c1f610a65b59789a6b5 /wp-includes/bookmark-template.php | |
| parent | 359223a4711934ea6ec20e4c7613832e1f1132b5 (diff) | |
| download | wordpress-mu-492aa4ee7086ed94cb2f37a2bce3b52905841659.tar.gz wordpress-mu-492aa4ee7086ed94cb2f37a2bce3b52905841659.tar.xz wordpress-mu-492aa4ee7086ed94cb2f37a2bce3b52905841659.zip | |
WP Merge to rev 5007
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@909 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/bookmark-template.php')
| -rw-r--r-- | wp-includes/bookmark-template.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php index e73edd7..54b6d15 100644 --- a/wp-includes/bookmark-template.php +++ b/wp-includes/bookmark-template.php @@ -326,15 +326,13 @@ function wp_list_bookmarks($args = '') { $output = ''; - if ( is_array($class) ) - $class = trim(join(' ', $class)); - if ( $categorize ) { //Split the bookmarks into ul's for each category $cats = get_categories("type=link&category_name=$category_name&include=$category&orderby=$category_orderby&order=$category_order&hierarchical=0"); foreach ( (array) $cats as $cat ) { - $bookmarks = get_bookmarks("limit=$limit&category={$cat->cat_ID}&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_invisible&show_updated=$show_updated"); + $params = array_merge($r, array('category'=>$cat->cat_ID)); + $bookmarks = get_bookmarks($params); if ( empty($bookmarks) ) continue; $output .= str_replace(array('%id', '%class'), array("linkcat-$cat->cat_ID", $class), $category_before); @@ -344,7 +342,7 @@ function wp_list_bookmarks($args = '') { } } else { //output one single list using title_li for the title - $bookmarks = get_bookmarks("limit=$limit&category=$category&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_invisible&show_updated=$show_updated"); + $bookmarks = get_bookmarks($r); if ( !empty($bookmarks) ) { if ( !empty( $title_li ) ){ |