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

trunk/wp-includes/functions-post.php

@@ -7 +7 @@
  */
 function wp_insert_post($postarr = array()) {
-    global $wpdb, $tableposts, $post_default_category;
+    global $wpdb, $post_default_category;
     
     // export array as variables
@@ -32 +32 @@
         $post_date_gmt = get_gmt_from_date($post_date);
     
-    $sql = "INSERT INTO $tableposts 
+    $sql = "INSERT INTO $wpdb->posts 
         (post_author, post_date, post_date_gmt, post_modified, post_modified_gmt, post_content, post_title, post_excerpt, post_category, post_status, post_name) 
         VALUES ('$post_author', '$post_date', '$post_date_gmt', '$post_date', '$post_date_gmt', '$post_content', '$post_title', '$post_excerpt', '$post_cat', '$post_status', '$post_name')";
@@ -50 +50 @@
 
 function wp_get_single_post($postid = 0, $mode = OBJECT) {
-    global $wpdb, $tableposts;
-
-    $sql = "SELECT * FROM $tableposts WHERE ID=$postid";
+    global $wpdb;
+
+    $sql = "SELECT * FROM $wpdb->posts WHERE ID=$postid";
     $result = $wpdb->get_row($sql, $mode);
     
@@ -62 +62 @@
 
 function wp_get_recent_posts($num = 10) {
-    global $wpdb, $tableposts;
+    global $wpdb;
 
     // Set the limit clause, if we got a limit
@@ -69 +69 @@
     }
 
-    $sql = "SELECT * FROM $tableposts ORDER BY post_date DESC $limit";
+    $sql = "SELECT * FROM $wpdb->posts ORDER BY post_date DESC $limit";
     $result = $wpdb->get_results($sql,ARRAY_A);
 
@@ -76 +76 @@
 
 function wp_update_post($postarr = array()) {
-    global $wpdb, $tableposts;
+    global $wpdb;
 
     // First get all of the original fields
@@ -97 +97 @@
     $post_modified_gmt = current_time('mysql', 1);
 
-    $sql = "UPDATE $tableposts 
+    $sql = "UPDATE $wpdb->posts 
         SET post_content = '$post_content',
         post_title = '$post_title',
@@ -119 +119 @@
 
 function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-    global $wpdb, $tablepost2cat;
+    global $wpdb;
     
     $sql = "SELECT category_id 
-        FROM $tablepost2cat 
+        FROM $wpdb->post2cat 
         WHERE post_id = $post_ID 
         ORDER BY category_id";
@@ -132 +132 @@
 
 function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-    global $wpdb, $tablepost2cat;
+    global $wpdb;
     // If $post_categories isn't already an array, make it one:
     if (!is_array($post_categories)) {
@@ -146 +146 @@
     $old_categories = $wpdb->get_col("
         SELECT category_id 
-        FROM $tablepost2cat 
+        FROM $wpdb->post2cat 
         WHERE post_id = $post_ID");
     
@@ -169 +169 @@
         foreach ($delete_cats as $del) {
             $wpdb->query("
-                DELETE FROM $tablepost2cat 
+                DELETE FROM $wpdb->post2cat 
                 WHERE category_id = $del 
                     AND post_id = $post_ID 
@@ -186 +186 @@
         foreach ($add_cats as $new_cat) {
             $wpdb->query("
-                INSERT INTO $tablepost2cat (post_id, category_id) 
+                INSERT INTO $wpdb->post2cat (post_id, category_id) 
                 VALUES ($post_ID, $new_cat)");
 
@@ -195 +195 @@
 
 function wp_delete_post($postid = 0) {
-    global $wpdb, $tableposts, $tablepost2cat;
-    
-    $sql = "DELETE FROM $tablepost2cat WHERE post_id = $postid";
+    global $wpdb;
+    
+    $sql = "DELETE FROM $wpdb->post2cat WHERE post_id = $postid";
     $wpdb->query($sql);
         
-    $sql = "DELETE FROM $tableposts WHERE ID = $postid";
+    $sql = "DELETE FROM $wpdb->posts WHERE ID = $postid";
     
     $wpdb->query($sql);
@@ -216 +216 @@
 function post_permalink($post_ID=0, $mode = 'id') {
     global $wpdb;
-    global $tableposts;
     global $querystring_start, $querystring_equal, $querystring_separator;
 
@@ -266 +265 @@
 // Get the name of a category from its ID
 function get_cat_name($cat_id) {
-    global $wpdb,$tablecategories;
+    global $wpdb;
     
     $cat_id -= 0;   // force numeric
-    $name = $wpdb->get_var("SELECT cat_name FROM $tablecategories WHERE cat_ID=$cat_id");
+    $name = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE cat_ID=$cat_id");
     
     return $name;
@@ -276 +275 @@
 // Get the ID of a category from its name
 function get_cat_ID($cat_name='General') {
-    global $wpdb,$tablecategories;
-    
-    $cid = $wpdb->get_var("SELECT cat_ID FROM $tablecategories WHERE cat_name='$cat_name'");
+    global $wpdb;
+    
+    $cid = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'");
 
     return $cid?$cid:1; // default to cat 1