Changeset 3658

Timestamp:

03/24/2006 07:22:22 PM (19 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/template-functions-bookmarks.php (modified) (5 diffs)

trunk/wp-includes/template-functions-bookmarks.php

@@ -78 +78 @@
         $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");
@@ -235 +239 @@
     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
@@ -283 +287 @@
         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' => '');
     $r = array_merge($defaults, $r);
@@ -291 +295 @@
     if ( !empty($include) ) {
     $exclude = '';  //ignore exclude, category, and category_name params if using include
-    $category = -1;
+    $category = '';
     $category_name = '';
         $inclinks = preg_split('/[\s,]+/',$include);
@@ -328 +332 @@
     $category_query = '';
     $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) ";
-
-        $category_query = " AND category_id = $category ";
     }