Simplify return from WP_Post::__get() now that references are no longer returned. see #21309

git-svn-id: http://core.svn.wordpress.org/trunk@21655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-08-29 13:42:11 +00:00
parent a43222bfaf
commit 16b01d701e

View File

@ -489,39 +489,32 @@ final class WP_Post {
public function __get( $key ) { public function __get( $key ) {
if ( 'page_template' == $key && $this->__isset( $key ) ) { if ( 'page_template' == $key && $this->__isset( $key ) ) {
$_ref = get_post_meta( $this->ID, '_wp_page_template', true ); return get_post_meta( $this->ID, '_wp_page_template', true );
} }
if ( 'post_category' == $key ) { if ( 'post_category' == $key ) {
if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) { if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
$_ref = wp_get_post_categories( $this->ID ); return wp_get_post_categories( $this->ID );
} else { else
$_ref = array(); return array();
}
} }
if ( 'tags_input' == $key ) { if ( 'tags_input' == $key ) {
if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) { if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
$_ref = wp_get_post_tags( $this->ID, array( 'fields' => 'names' ) ); return wp_get_post_tags( $this->ID, array( 'fields' => 'names' ) );
} else { else
$_ref = array(); return array();
} }
}
if ( isset( $_ref ) )
return $_ref;
// Rest of the values need filtering // Rest of the values need filtering
if ( 'ancestors' == $key ) { if ( 'ancestors' == $key )
$value = get_post_ancestors( $this ); $value = get_post_ancestors( $this );
} else { else
$value = get_post_meta( $this->ID, $key, true ); $value = get_post_meta( $this->ID, $key, true );
}
if ( $this->filter ) { if ( $this->filter )
$value = sanitize_post_field( $key, $value, $this->ID, $this->filter ); $value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
}
return $value; return $value;
} }