Changeset 678 for trunk/wp-includes/links.php

Timestamp:

01/01/2004 10:13:06 PM (23 years ago)

Author:

saxmatt

Message:

Use modified get_links_list

File:

• trunk/wp-includes/links.php (modified) (4 diffs)

trunk/wp-includes/links.php

@@ -515 +515 @@
  *   hide_if_empty (default true)  - Supress listing empty link categories
  */
-function get_links_list($order = 'name', $hide_if_empty = true) {
+function get_links_list($order = 'name', $hide_if_empty = 'obsolete') {
     global $tablelinkcategories, $tablelinks, $wpdb;
 
@@ -527 +527 @@
 
     // if 'name' wasn't specified, assume 'id':
-    $cat_order = ('name' == $order)?'cat_name':'cat_id';
-
-    if ($hide_if_empty) {
-        $extra_join = "LEFT JOIN $tablelinks ON link_category = cat_id";
-        $group_by_having = 'GROUP BY cat_id HAVING count(link_id) > 0';
-    }
+    $cat_order = ('name' == $order) ? 'cat_name' : 'cat_id';
+
 
     // Fetch the link category data as an array of hashes
-    $cats = $wpdb->get_results("SELECT cat_id, cat_name, show_images,
+    $cats = $wpdb->get_results("SELECT DISTINCT link_category, cat_name, show_images,
         show_description, show_rating, show_updated, sort_order, sort_desc, list_limit
-        FROM $tablelinkcategories $extra_join
-        $group_by_having
-        ORDER BY $cat_order $direction ",ARRAY_A);
+FROM `$tablelinks` LEFT JOIN `$tablelinkcategories` ON (link_category = cat_id)
+WHERE link_visible =  'Y'
+        ORDER BY $cat_order $direction ", ARRAY_A);
 
     // Display each category
     if ($cats) {
-        // Start the unordered list
-        echo "<ul>\n";
-
         foreach ($cats as $cat) {
             // Handle each category.
-
             // First, fix the sort_order info
             $orderby = $cat['sort_order'];
@@ -554 +546 @@
 
             // Display the category name
-            echo '<li>' . stripslashes($cat['cat_name']) . "\n<ul>\n";
+            echo '  <li>' . stripslashes($cat['cat_name']) . "\n\t<ul>\n";
 
             // Call get_links() with all the appropriate params
-            get_links($cat['cat_id'],
+            get_links($cat['link_category'],
                 '<li>',"</li>","\n",
                 bool_from_yn($cat['show_images']),
@@ -567 +559 @@
 
             // Close the last category
-            echo "</ul>\n</li>\n";
-
+            echo "\n\t</ul>\n</li>\n";
         }
-        // Close out our category list.
-        echo "</ul>\n";
     }
 }