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

git-svn-id: http://svn.automattic.com/wordpress/trunk@2524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-04-09 17:25:47 +00:00
parent e54d8a34c2
commit 92805e971f
2 changed files with 20 additions and 23 deletions

View File

@ -207,7 +207,7 @@ case 'edit':
if ( !user_can_edit_post($user_ID, $post_ID) )
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);
$content = apply_filters('content_edit_pre', $content);
@ -237,7 +237,7 @@ case 'edit':
include('edit-form-advanced.php');
}
$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$post_ID'");
$post = &$postdata;
?>
<div id='preview' class='wrap'>
<h2><?php _e('Post Preview (updated when post is saved)'); ?></h2>
@ -527,7 +527,7 @@ case 'deletecomment':
$noredir = false;
}
$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'));
if (!user_can_delete_post_comments($user_ID, $commentdata['comment_post_ID'])) {

View File

@ -461,30 +461,27 @@ meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'");
return true;
}
// 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;
}