Changeset 1355 for trunk/wp-includes/template-functions-general.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-general.php (modified) (13 diffs)

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

@@ -92 +92 @@
 
 function wp_title($sep = '»', $display = true) {
-    global $wpdb, $tableposts, $tablecategories;
+    global $wpdb;
     global $year, $monthnum, $day, $cat, $p, $name, $month, $posts, $single;
 
@@ -102 +102 @@
     }
     if (!empty($category_name)) {
-        $title = stripslashes($wpdb->get_var("SELECT cat_name FROM $tablecategories WHERE category_nicename = '$category_name'"));
+        $title = stripslashes($wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'"));
     }
 
@@ -137 +137 @@
 
 function single_post_title($prefix = '', $display = true) {
-    global $p, $name, $wpdb, $tableposts;
+    global $p, $name, $wpdb;
     if (intval($p) || '' != $name) {
         if (!$p) {
-            $p = $wpdb->get_var("SELECT ID FROM $tableposts WHERE post_name = '$name'");
+            $p = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_name = '$name'");
         }
         $post_data = get_postdata($p);
@@ -203 +203 @@
 
 function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-    global $tableposts;
     global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb;
 
@@ -244 +243 @@
 
     if ('monthly' == $type) {
-        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $tableposts WHERE post_date < '$now' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
         if ($arcresults) {
             $afterafter = $after;
@@ -259 +258 @@
         }
     } elseif ('daily' == $type) {
-        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth` FROM $tableposts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth` FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         if ($arcresults) {
             foreach ($arcresults as $arcresult) {
@@ -270 +269 @@
     } elseif ('weekly' == $type) {
     $start_of_week = get_settings('start_of_week');
-        $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $tableposts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         $arc_w_last = '';
         if ($arcresults) {
@@ -289 +288 @@
         }
     } elseif ('postbypost' == $type) {
-        $arcresults = $wpdb->get_results("SELECT ID, post_date, post_title FROM $tableposts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT ID, post_date, post_title FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         if ($arcresults) {
             foreach ($arcresults as $arcresult) {
@@ -308 +307 @@
 
 function get_calendar($daylength = 1) {
-    global $wpdb, $m, $monthnum, $year, $timedifference, $month, $month_abbrev, $weekday, $weekday_initial, $weekday_abbrev, $tableposts, $posts;
+    global $wpdb, $m, $monthnum, $year, $timedifference, $month, $month_abbrev, $weekday, $weekday_initial, $weekday_abbrev, $posts;
 
     // Quick check. If we have no posts at all, abort!
     if (!$posts) {
-        $gotsome = $wpdb->get_var("SELECT ID from $tableposts WHERE post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
+        $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
         if (!$gotsome)
             return;
@@ -350 +349 @@
     // Get the next and previous month and year with at least one post
     $previous = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
-            FROM $tableposts
+            FROM $wpdb->posts
             WHERE post_date < '$thisyear-$thismonth-01'
             AND post_status = 'publish'
@@ -356 +355 @@
                               LIMIT 1");
     $next = $wpdb->get_row("SELECT  DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
-            FROM $tableposts
+            FROM $wpdb->posts
             WHERE post_date >  '$thisyear-$thismonth-01'
             AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
@@ -410 +409 @@
     // Get days with posts
     $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
-            FROM $tableposts WHERE MONTH(post_date) = $thismonth
+            FROM $wpdb->posts WHERE MONTH(post_date) = $thismonth
             AND YEAR(post_date) = $thisyear
             AND post_status = 'publish'
@@ -434 +433 @@
     $ak_titles_for_day = array();
     $ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
-                                         ."FROM $tableposts "
+                                         ."FROM $wpdb->posts "
                                          ."WHERE YEAR(post_date) = '$thisyear' "
                                          ."AND MONTH(post_date) = '$thismonth' "