summaryrefslogtreecommitdiffstats
path: root/wp-inst
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-02-16 12:22:15 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-02-16 12:22:15 +0000
commit3274315bf43466070cd481ee2d08cf8114d3c8f7 (patch)
tree35262116e0a8274a014dcf35637b600d18bf2d03 /wp-inst
parent305af4f29135203d0f59ac359a3d4b02352f7650 (diff)
downloadwordpress-mu-3274315bf43466070cd481ee2d08cf8114d3c8f7.tar.gz
wordpress-mu-3274315bf43466070cd481ee2d08cf8114d3c8f7.tar.xz
wordpress-mu-3274315bf43466070cd481ee2d08cf8114d3c8f7.zip
WP merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@527 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst')
-rw-r--r--wp-inst/wp-includes/comment-functions.php2
-rw-r--r--wp-inst/wp-includes/functions.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/comment-functions.php b/wp-inst/wp-includes/comment-functions.php
index bada2dc..efe4c95 100644
--- a/wp-inst/wp-includes/comment-functions.php
+++ b/wp-inst/wp-includes/comment-functions.php
@@ -767,7 +767,7 @@ function is_local_attachment($url) {
return true;
if ( $id = url_to_postid($url) ) {
$post = & get_post($id);
- if ( 'attachment' == $post->post_status )
+ if ( 'attachment' == $post->post_type )
return true;
}
return false;
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index 26ed620..b0bd13e 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -561,6 +561,7 @@ function get_postdata($postid) {
'post_password' => $post->post_password,
'to_ping' => $post->to_ping,
'pinged' => $post->pinged,
+ 'post_type' => $post->post_type,
'post_name' => $post->post_name
);