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

Retrieve bookmarks for multiple cats. Props MichaelH. fixes #2592 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-03-24 19:22:22 +00:00
parent afd6dc76ba
commit fe009bb136
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/template-functions-bookmarks.php
View File

@ -78,6 +78,10 @@ function get_links($category = -1,
$orderby = substr($orderby, 1); $orderby = substr($orderby, 1);
} }
if ($category == -1) { //get_bookmarks uses '' to signify all categories
$category = '';
}
$results = get_bookmarks("category=$category&orderby=$orderby&order=$order&show_updated=$show_updated&limit=$limit"); $results = get_bookmarks("category=$category&orderby=$orderby&order=$order&show_updated=$show_updated&limit=$limit");
if (!$results) { if (!$results) {
@ -234,7 +238,7 @@ function get_links_list($order = 'name', $hide_if_empty = 'obsolete') {
if (!isset($direction)) $direction = ''; if (!isset($direction)) $direction = '';
$cats = get_categories("type=link&orderby=$order&order=$direction"); $cats = get_categories("type=link&orderby=$order&order=$direction&hierarchical=0");
// Display each category // Display each category
if ($cats) { if ($cats) {
@ -282,7 +286,7 @@ function get_bookmarks($args = '') {
else else
parse_str($args, $r); parse_str($args, $r);
$defaults = array('orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => -1, $defaults = array('orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => '',
'category_name' => '', 'hide_invisible' => 1, 'show_updated' => 0, 'include' => '', 'exclude' => ''); 'category_name' => '', 'hide_invisible' => 1, 'show_updated' => 0, 'include' => '', 'exclude' => '');
$r = array_merge($defaults, $r); $r = array_merge($defaults, $r);
extract($r); extract($r);
@ -290,7 +294,7 @@ function get_bookmarks($args = '') {
$inclusions = ''; $inclusions = '';
if ( !empty($include) ) { if ( !empty($include) ) {
$exclude = ''; //ignore exclude, category, and category_name params if using include $exclude = ''; //ignore exclude, category, and category_name params if using include
$category = -1; $category = '';
$category_name = ''; $category_name = '';
$inclinks = preg_split('/[\s,]+/',$include); $inclinks = preg_split('/[\s,]+/',$include);
if ( count($inclinks) ) { if ( count($inclinks) ) {
@ -327,10 +331,20 @@ function get_bookmarks($args = '') {
$category_query = ''; $category_query = '';
$join = ''; $join = '';
if ( $category != -1 && !empty($category) ) { if ( !empty($category) ) {
$incategories = preg_split('/[\s,]+/',$category);
if ( count($incategories) ) {
foreach ( $incategories as $incat ) {
if (empty($category_query))
$category_query = ' AND ( category_id = ' . intval($incat) . ' ';
else
$category_query .= ' OR category_id = ' . intval($incat) . ' ';
}
}
}
if (!empty($category_query)) {
$category_query .= ')';
$join = " LEFT JOIN $wpdb->link2cat ON ($wpdb->links.link_id = $wpdb->link2cat.link_id) "; $join = " LEFT JOIN $wpdb->link2cat ON ($wpdb->links.link_id = $wpdb->link2cat.link_id) ";
$category_query = " AND category_id = $category ";
} }
if (get_settings('links_recently_updated_time')) { if (get_settings('links_recently_updated_time')) {