Changeset 1355 for trunk/wp-includes/template-functions-category.php

Timestamp:

05/24/2004 08:22:18 AM (21 years ago)

Author:

saxmatt

Message:

Giant commit, sorry mailing list people. Move all table names to new $wpdb versions. Works but the whole app needs thorough testing now.

File:

• trunk/wp-includes/template-functions-category.php (modified) (13 diffs)

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

@@ -2 +2 @@
 
 function get_the_category() {
-    global $post, $tablecategories, $tablepost2cat, $wpdb, $category_cache;
+    global $post, $wpdb, $category_cache;
     if ($category_cache[$post->ID]) {
         return $category_cache[$post->ID];
@@ -8 +8 @@
         $categories = $wpdb->get_results("
             SELECT category_id, cat_name, category_nicename, category_description, category_parent
-            FROM  $tablecategories, $tablepost2cat
-            WHERE $tablepost2cat.category_id = cat_ID AND $tablepost2cat.post_id = $post->ID
+            FROM  $wpdb->categories, $wpdb->post2cat
+            WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = $post->ID
             ");
     
@@ -17 +17 @@
 
 function get_category_link($echo = false, $category_id, $category_nicename) {
-    global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $cache_categories;
+    global $wpdb, $post, $querystring_start, $querystring_equal, $cache_categories;
     $cat_ID = $category_id;
     $permalink_structure = get_settings('permalink_structure');
@@ -124 +124 @@
 
 function get_the_category_by_ID($cat_ID) {
-    global $tablecategories, $cache_categories, $wpdb;
+    global $cache_categories, $wpdb;
     if ( !$cache_categories[$cat_ID] ) {
-        $cat_name = $wpdb->get_var("SELECT cat_name FROM $tablecategories WHERE cat_ID = '$cat_ID'");
+        $cat_name = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
         $cache_categories[$cat_ID]->cat_name = $cat_name;
     } else {
@@ -135 +135 @@
 
 function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = FALSE){
-    global $tablecategories, $cache_categories;
-    $chain = "";
+    global $cache_categories;
+    $chain = '';
     $parent = $cache_categories[$id];
     if ($nicename) {
@@ -153 +153 @@
 
 function get_category_children($id, $before = '/', $after = '') {
-    global $tablecategories, $cache_categories;
+    global $cache_categories;
     $c_cache = $cache_categories; // Can't do recursive foreach on a global, have to make a copy
     $chain = '';
@@ -185 +185 @@
 
 function category_description($category = 0) {
-    global $cat, $wpdb, $tablecategories, $cache_categories;
+    global $cat, $wpdb, $cache_categories;
     if (!$category) $category = $cat;
     $category_description = $cache_categories[$category]->category_description;
@@ -196 +196 @@
         $optiondates = 0, $optioncount = 0, $hide_empty = 1, $optionnone=FALSE,
         $selected=0, $hide=0) {
-    global $tablecategories, $tableposts, $tablepost2cat, $wpdb;
+    global $wpdb;
     global $querystring_start, $querystring_equal, $querystring_separator;
     if (($file == 'blah') || ($file == '')) $file = get_settings('home') . '/' . get_settings('blogfilename');
@@ -204 +204 @@
     $query = "
         SELECT cat_ID, cat_name, category_nicename,category_parent,
-        COUNT($tablepost2cat.post_id) AS cat_count,
+        COUNT($wpdb->post2cat.post_id) AS cat_count,
         DAYOFMONTH(MAX(post_date)) AS lastday, MONTH(MAX(post_date)) AS lastmonth
-        FROM $tablecategories LEFT JOIN $tablepost2cat ON (cat_ID = category_id)
-        LEFT JOIN $tableposts ON (ID = post_id)
+        FROM $wpdb->categories LEFT JOIN $wpdb->post2cat ON (cat_ID = category_id)
+        LEFT JOIN $wpdb->posts ON (ID = post_id)
         WHERE cat_ID > 0
         ";
@@ -266 +266 @@
 
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '') {
-    global $tablecategories, $tableposts, $tablepost2cat, $wpdb, $category_posts;
+    global $wpdb, $category_posts;
     global $querystring_start, $querystring_equal, $querystring_separator;
     // Optiondates now works
@@ -288 +288 @@
         $query  = "
             SELECT cat_ID, cat_name, category_nicename, category_description, category_parent
-            FROM $tablecategories
+            FROM $wpdb->categories
             WHERE cat_ID > 0 $exclusions
             ORDER BY $sort_column $sort_order";
@@ -296 +296 @@
     if (!count($category_posts)) {
         $cat_counts = $wpdb->get_results("  SELECT cat_ID,
-        COUNT($tablepost2cat.post_id) AS cat_count
-        FROM $tablecategories 
-        INNER JOIN $tablepost2cat ON (cat_ID = category_id)
-        INNER JOIN $tableposts ON (ID = post_id)
+        COUNT($wpdb->post2cat.post_id) AS cat_count
+        FROM $wpdb->categories 
+        INNER JOIN $wpdb->post2cat ON (cat_ID = category_id)
+        INNER JOIN $wpdb->posts ON (ID = post_id)
         WHERE post_status = 'publish' $exclusions
         GROUP BY category_id");
@@ -312 +312 @@
         $cat_dates = $wpdb->get_results("   SELECT cat_ID,
         DAYOFMONTH(MAX(post_date)) AS lastday, MONTH(MAX(post_date)) AS lastmonth
-        FROM $tablecategories 
-        LEFT JOIN $tablepost2cat ON (cat_ID = category_id)
-        LEFT JOIN $tableposts ON (ID = post_id)
+        FROM $wpdb->categories 
+        LEFT JOIN $wpdb->post2cat ON (cat_ID = category_id)
+        LEFT JOIN $wpdb->posts ON (ID = post_id)
         WHERE post_status = 'publish' $exclusions
         GROUP BY category_id");