Changeset 1355 for trunk/wp-admin/admin-functions.php

Timestamp:

05/24/2004 08:22:18 AM (20 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-admin/admin-functions.php (modified) (10 diffs)

trunk/wp-admin/admin-functions.php

@@ -20 +20 @@
 
 function get_nested_categories($default = 0) {
- global $post_ID, $tablecategories, $tablepost2cat, $mode, $wpdb;
+ global $post_ID, $mode, $wpdb;
 
  if ($post_ID) {
    $checked_categories = $wpdb->get_col("
      SELECT category_id
-     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'
      ");
  } else {
@@ -32 +32 @@
  }
 
- $categories = $wpdb->get_results("SELECT * FROM $tablecategories ORDER BY category_parent DESC, cat_name ASC");
+ $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY category_parent DESC, cat_name ASC");
  $result = array();
  foreach($categories as $category) {
@@ -67 +67 @@
 // Dandy new recursive multiple category stuff.
 function cat_rows($parent = 0, $level = 0, $categories = 0) {
-    global $wpdb, $tablecategories, $tablepost2cat, $bgcolor;
+    global $wpdb, $bgcolor;
     if (!$categories) {
-        $categories = $wpdb->get_results("SELECT * FROM $tablecategories ORDER BY cat_name");
+        $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
     }
     if ($categories) {
         foreach ($categories as $category) {
             if ($category->category_parent == $parent) {
-                $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $tablepost2cat WHERE category_id = $category->cat_ID");
+                $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID");
                 $pad = str_repeat('— ', $level);
 
@@ -92 +92 @@
 
 function wp_dropdown_cats($currentcat, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) {
-    global $wpdb, $tablecategories, $tablepost2cat, $bgcolor;
+    global $wpdb, $bgcolor;
     if (!$categories) {
-        $categories = $wpdb->get_results("SELECT * FROM $tablecategories ORDER BY cat_name");
+        $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
     }
     if ($categories) {
         foreach ($categories as $category) { if ($currentcat != $category->cat_ID && $parent == $category->category_parent) {
-            $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $tablepost2cat WHERE category_id = $category->cat_ID");
+            $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID");
             $pad = str_repeat('– ', $level);
             echo "\n\t<option value='$category->cat_ID'";
@@ -200 +200 @@
 // Some postmeta stuff
 function has_meta($postid) {
-    global $wpdb, $tablepostmeta;
+    global $wpdb;
 
     return $wpdb->get_results("
         SELECT meta_key, meta_value, meta_id, post_id
-        FROM $tablepostmeta
+        FROM $wpdb->postmeta
         WHERE post_id = '$postid'
         ORDER BY meta_key,meta_id",ARRAY_A);
@@ -241 +241 @@
 // Get a list of previously defined keys
 function get_meta_keys() {
-    global $wpdb, $tablepostmeta;
+    global $wpdb;
     
     $keys = $wpdb->get_col("
         SELECT meta_key
-        FROM $tablepostmeta
+        FROM $wpdb->postmeta
         GROUP BY meta_key
         ORDER BY meta_key");
@@ -253 +253 @@
 
 function meta_form() {
-    global $wpdb, $tablepostmeta;
+    global $wpdb;
     $keys = $wpdb->get_col("
         SELECT meta_key
-        FROM $tablepostmeta
+        FROM $wpdb->postmeta
         GROUP BY meta_key
         ORDER BY meta_id DESC
@@ -290 +290 @@
 
 function add_meta($post_ID) {
-    global $wpdb, $tablepostmeta;
+    global $wpdb;
     
     $metakeyselect = $wpdb->escape( stripslashes( trim($_POST['metakeyselect']) ) );
@@ -307 +307 @@
 
         $result = $wpdb->query("
-                INSERT INTO $tablepostmeta 
+                INSERT INTO $wpdb->postmeta 
                 (post_id,meta_key,meta_value) 
                 VALUES ('$post_ID','$metakey','$metavalue')
@@ -315 +315 @@
 
 function delete_meta($mid) {
-    global $wpdb, $tablepostmeta;
-
-    $result = $wpdb->query("DELETE FROM $tablepostmeta WHERE meta_id = '$mid'");
+    global $wpdb;
+
+    $result = $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'");
 }
 
 function update_meta($mid, $mkey, $mvalue) {
-    global $wpdb, $tablepostmeta;
-
-    return $wpdb->query("UPDATE $tablepostmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'");
+    global $wpdb;
+
+    return $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'");
 }