Changeset 2551

Timestamp:

04/19/2005 05:17:36 PM (20 years ago)

Author:

matt

Message:

More consistent use of cat_ID vs category_id

Location:

trunk/wp-includes

Files:

• feed-functions.php (modified) (1 diff)
• functions.php (modified) (4 diffs)
• template-functions-category.php (modified) (8 diffs)

trunk/wp-includes/feed-functions.php

@@ -107 +107 @@
 }
 
-function get_category_rss_link($echo = false, $category_id, $category_nicename) {
-       $cat_ID = $category_id;
+function get_category_rss_link($echo = false, $cat_ID, $category_nicename) {
        $permalink_structure = get_settings('permalink_structure');
 

trunk/wp-includes/functions.php

@@ -592 +592 @@
         if ( !isset($cache_categories[$category]) ) {
             $category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = $category");
-            $category->category_id = $category->cat_ID; // Alias.
             $cache_categories[$category->cat_ID] = & $category;
         } else {
@@ -1124 +1123 @@
 
     $dogs = $wpdb->get_results("SELECT DISTINCT
-    post_id, category_id FROM $wpdb->categories, $wpdb->post2cat
+    post_id, cat_ID FROM $wpdb->categories, $wpdb->post2cat
     WHERE category_id = cat_ID AND post_id IN ($post_ids)");
 
@@ -1132 +1131 @@
     if ( !empty($dogs) ) {
         foreach ($dogs as $catt) {
-            $category_cache[$catt->post_id][$catt->category_id] = &$cache_categories[$catt->category_id];
+            $category_cache[$catt->post_id][$catt->cat_ID] = &$cache_categories[$catt->cat_ID];
         }
     }
@@ -1190 +1189 @@
 function update_category_cache() {
     global $cache_categories, $wpdb;
-    $dogs = $wpdb->get_results("SELECT *, cat_ID as category_id FROM $wpdb->categories");
+    $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
     foreach ($dogs as $catt)
         $cache_categories[$catt->cat_ID] = $catt;

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

@@ -57 +57 @@
                         $thelist .= get_category_parents($category->category_parent, TRUE);
                     }
-                    $thelist .= '<a href="' . get_category_link($category->category_id) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>';
                     break;
                 case 'single':
-                    $thelist .= '<a href="' . get_category_link($category->category_id) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . ' rel="category tag">';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . ' rel="category tag">';
                     if ($category->category_parent) {
                         $thelist .= get_category_parents($category->category_parent, FALSE);
@@ -68 +68 @@
                 case '':
                 default:
-                    $thelist .= '<a href="' . get_category_link($category->category_id) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>';
             }
         }
@@ -80 +80 @@
                 case 'multiple':
                     if ($category->category_parent)    $thelist .= get_category_parents($category->category_parent, TRUE);
-                    $thelist .= '<a href="' . get_category_link($category->category_id) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>';
                     break;
                 case 'single':
-                    $thelist .= '<a href="' . get_category_link($category->category_id) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">';
                     if ($category->category_parent)    $thelist .= get_category_parents($category->category_parent, FALSE);
                     $thelist .= "$category->cat_name</a>";
@@ -89 +89 @@
                 case '':
                 default:
-                    $thelist .= '<a href="' . get_category_link($category->category_id) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>';
             }
             ++$i;
@@ -140 +140 @@
     // Grab the first cat in the list.
     $categories = get_the_category();
-    $cat = $categories[0]->category_id;
+    $cat = $categories[0]->cat_ID;
     
     if ($echo) echo $cat;
@@ -289 +289 @@
     
     if ( $optiondates ) {
-        $cat_dates = $wpdb->get_results("   SELECT category_id,
+        $cat_dates = $wpdb->get_results("   SELECT cat_ID,
         UNIX_TIMESTAMP( MAX(post_date) ) AS ts
         FROM $wpdb->posts, $wpdb->post2cat
@@ -295 +295 @@
         GROUP BY category_id");
         foreach ($cat_dates as $cat_date) {
-            $category_timestamp["$cat_date->category_id"] = $cat_date->ts;
+            $category_timestamp["$cat_date->cat_ID"] = $cat_date->ts;
         }
     }
@@ -387 +387 @@
     $cats = '';
     foreach ($category_cache[$post->ID] as $cat) :
-        $cats[] = $cat->category_id;
+        $cats[] = $cat->cat_ID;
     endforeach;