Changeset 2524

Timestamp:

04/09/2005 05:25:47 PM (20 years ago)

Author:

ryan

Message:

Make get_postdata() use get_post(). Label get_postdata() as deprecated. Remove the one remaining call to get_postdata().

Location:

trunk

Files:

• wp-admin/post.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/post.php

@@ -208 +208 @@
         die ( __('You are not allowed to edit this post.') );
         
-    $postdata = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$post_ID'");
+    $postdata = &get_post($post_ID);
     $content = $postdata->post_content;
     $content = format_to_edit($content);
@@ -238 +238 @@
     }
 
-    $post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$post_ID'");
+    $post = &$postdata;
     ?>
     <div id='preview' class='wrap'>
@@ -528 +528 @@
     }
 
-    $postdata = get_postdata($p) or die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+    $postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
     $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'post.php'));
 

trunk/wp-includes/functions.php

@@ -462 +462 @@
 }
 
+// Deprecated.  Use get_post().
 function get_postdata($postid) {
-    global $post, $wpdb;
-
-    if ( $postid == $post->ID )
-        $a_post = $post;
-    else 
-        $a_post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$postid'");
+    $post = &get_post($postid);
     
     $postdata = array (
-        'ID' => $a_post->ID, 
-        'Author_ID' => $a_post->post_author, 
-        'Date' => $a_post->post_date, 
-        'Content' => $a_post->post_content, 
-        'Excerpt' => $a_post->post_excerpt, 
-        'Title' => $a_post->post_title, 
-        'Category' => $a_post->post_category,
-        'post_status' => $a_post->post_status,
-        'comment_status' => $a_post->comment_status,
-        'ping_status' => $a_post->ping_status,
-        'post_password' => $a_post->post_password,
-        'to_ping' => $a_post->to_ping,
-        'pinged' => $a_post->pinged,
-        'post_name' => $a_post->post_name
+        'ID' => $post->ID, 
+        'Author_ID' => $post->post_author, 
+        'Date' => $post->post_date, 
+        'Content' => $post->post_content, 
+        'Excerpt' => $post->post_excerpt, 
+        'Title' => $post->post_title, 
+        'Category' => $post->post_category,
+        'post_status' => $post->post_status,
+        'comment_status' => $post->comment_status,
+        'ping_status' => $post->ping_status,
+        'post_password' => $post->post_password,
+        'to_ping' => $post->to_ping,
+        'pinged' => $post->pinged,
+        'post_name' => $post->post_name
     );
+
     return $postdata;
 }