Ticket #21309: post-to-edit.2.diff
File post-to-edit.2.diff, 12.9 KB (added by , 12 years ago) |
---|
-
wp-admin/includes/deprecated.php
diff --git wp-admin/includes/deprecated.php wp-admin/includes/deprecated.php index 6a66e43..bc49030 100644
function current_theme_info() { 943 943 944 944 /** 945 945 * This was once used to display an 'Insert into Post' button. Now it is deprecated and stubbed. 946 * 946 * 947 947 * @deprecated 3.5.0 948 948 */ 949 949 function _insert_into_post_button( $type ) { … … function _insert_into_post_button( $type ) { 952 952 953 953 /** 954 954 * This was once used to display a media button. Now it is deprecated and stubbed. 955 * 955 * 956 956 * @deprecated 3.5.0 957 957 */ 958 958 function _media_button($title, $icon, $type, $id) { 959 959 _deprecated_function( __FUNCTION__, '3.5' ); 960 960 } 961 962 /** 963 * Get an existing post and format it for editing. 964 * 965 * @since 2.0.0 966 * @deprecated 3.5.0 967 * 968 * @param int $id 969 * @return object 970 */ 971 function get_post_to_edit( $id ) { 972 _deprecated_function( __FUNCTION__, '3.5', 'get_post()' ); 973 974 return get_post( $id, OBJECT, 'edit' ); 975 } 976 -
wp-admin/includes/post.php
diff --git wp-admin/includes/post.php wp-admin/includes/post.php index c57b72c..7ee873d 100644
function get_default_page_to_edit() { 463 463 } 464 464 465 465 /** 466 * Get an existing post and format it for editing.467 *468 * @since 2.0.0469 *470 * @param unknown_type $id471 * @return unknown472 */473 function get_post_to_edit( $id ) {474 475 $post = get_post( $id, OBJECT, 'edit' );476 477 if ( $post->post_type == 'page' )478 $post->page_template = get_post_meta( $id, '_wp_page_template', true );479 480 return $post;481 }482 483 /**484 466 * Determine if a post exists based on title, content, and date 485 467 * 486 468 * @since 2.0.0 … … function get_available_post_mime_types($type = 'attachment') { 927 909 /** 928 910 * Executes a query for attachments. An array of WP_Query arguments 929 911 * can be passed in, which will override the arguments set by this function. 930 * 912 * 931 913 * @since 2.5.0 932 914 * @uses apply_filters() Calls 'upload_per_page' on posts_per_page argument 933 915 * -
wp-admin/post.php
diff --git wp-admin/post.php wp-admin/post.php index 2c5ecb2..2bfc16e 100644
case 'edit': 165 165 } 166 166 167 167 $title = $post_type_object->labels->edit_item; 168 $post = get_post _to_edit($post_id);168 $post = get_post($post_id, OBJECT, 'edit'); 169 169 170 170 if ( post_type_supports($post_type, 'comments') ) { 171 171 wp_enqueue_script('admin-comments'); -
wp-includes/class-wp-atom-server.php
diff --git wp-includes/class-wp-atom-server.php wp-includes/class-wp-atom-server.php index d381673..ca61ae7 100644
EOD; 913 913 $this->not_found(); 914 914 } 915 915 916 $entry = wp_get_single_post($postID,ARRAY_A);916 $entry = get_post($postID,ARRAY_A); 917 917 918 918 if (!isset($entry) || !isset($entry['ID'])) 919 919 $this->not_found(); … … EOD; 1410 1410 switch($this->params[0]) { 1411 1411 case $this->ENTRY_PATH: 1412 1412 global $post; 1413 $post = wp_get_single_post($this->params[1]);1413 $post = get_post($this->params[1]); 1414 1414 $wp_last_modified = get_post_modified_time('D, d M Y H:i:s', true); 1415 1415 $post = null; 1416 1416 break; -
wp-includes/class-wp-xmlrpc-server.php
diff --git wp-includes/class-wp-xmlrpc-server.php wp-includes/class-wp-xmlrpc-server.php index 29fcc0e..674b33e 100644
class wp_xmlrpc_server extends IXR_Server { 1256 1256 1257 1257 do_action( 'xmlrpc_call', 'wp.deletePost' ); 1258 1258 1259 $post = wp_get_single_post( $post_id, ARRAY_A );1259 $post = get_post( $post_id, ARRAY_A ); 1260 1260 if ( empty( $post['ID'] ) ) 1261 1261 return new IXR_Error( 404, __( 'Invalid post ID.' ) ); 1262 1262 … … class wp_xmlrpc_server extends IXR_Server { 1286 1286 * groups are 'post' (all basic fields), 'taxonomies', 'custom_fields', 1287 1287 * and 'enclosure'. 1288 1288 * 1289 * @uses wp_get_single_post()1289 * @uses get_post() 1290 1290 * @param array $args Method parameters. Contains: 1291 1291 * - int $post_id 1292 1292 * - string $username … … class wp_xmlrpc_server extends IXR_Server { 1337 1337 1338 1338 do_action( 'xmlrpc_call', 'wp.getPost' ); 1339 1339 1340 $post = wp_get_single_post( $post_id, ARRAY_A );1340 $post = get_post( $post_id, ARRAY_A ); 1341 1341 1342 1342 if ( empty( $post['ID'] ) ) 1343 1343 return new IXR_Error( 404, __( 'Invalid post ID.' ) ); … … class wp_xmlrpc_server extends IXR_Server { 2060 2060 2061 2061 // Get the current page based on the page_id and 2062 2062 // make sure it is a page and not a post. 2063 $actual_page = wp_get_single_post($page_id, ARRAY_A);2063 $actual_page = get_post($page_id, ARRAY_A); 2064 2064 if ( !$actual_page || ($actual_page['post_type'] != 'page') ) 2065 2065 return(new IXR_Error(404, __('Sorry, no such page.'))); 2066 2066 … … class wp_xmlrpc_server extends IXR_Server { 2101 2101 do_action('xmlrpc_call', 'wp.editPage'); 2102 2102 2103 2103 // Get the page data and make sure it is a page. 2104 $actual_page = wp_get_single_post($page_id, ARRAY_A);2104 $actual_page = get_post($page_id, ARRAY_A); 2105 2105 if ( !$actual_page || ($actual_page['post_type'] != 'page') ) 2106 2106 return(new IXR_Error(404, __('Sorry, no such page.'))); 2107 2107 … … class wp_xmlrpc_server extends IXR_Server { 3296 3296 if ( !$user = $this->login($username, $password) ) 3297 3297 return $this->error; 3298 3298 3299 $post_data = wp_get_single_post($post_ID, ARRAY_A);3299 $post_data = get_post($post_ID, ARRAY_A); 3300 3300 if ( ! $post_data ) 3301 3301 return new IXR_Error( 404, __( 'Invalid post ID.' ) ); 3302 3302 … … class wp_xmlrpc_server extends IXR_Server { 3538 3538 3539 3539 do_action('xmlrpc_call', 'blogger.editPost'); 3540 3540 3541 $actual_post = wp_get_single_post($post_ID,ARRAY_A);3541 $actual_post = get_post($post_ID,ARRAY_A); 3542 3542 3543 3543 if ( !$actual_post || $actual_post['post_type'] != 'post' ) 3544 3544 return new IXR_Error(404, __('Sorry, no such post.')); … … class wp_xmlrpc_server extends IXR_Server { 3592 3592 3593 3593 do_action('xmlrpc_call', 'blogger.deletePost'); 3594 3594 3595 $actual_post = wp_get_single_post($post_ID,ARRAY_A);3595 $actual_post = get_post($post_ID,ARRAY_A); 3596 3596 3597 3597 if ( !$actual_post || $actual_post['post_type'] != 'post' ) 3598 3598 return new IXR_Error(404, __('Sorry, no such post.')); … … class wp_xmlrpc_server extends IXR_Server { 3982 3982 3983 3983 do_action('xmlrpc_call', 'metaWeblog.editPost'); 3984 3984 3985 $postdata = wp_get_single_post( $post_ID, ARRAY_A );3985 $postdata = get_post( $post_ID, ARRAY_A ); 3986 3986 3987 3987 // If there is no post data for the give post id, stop 3988 3988 // now and return an error. Other wise a new post will be … … class wp_xmlrpc_server extends IXR_Server { 4247 4247 if ( !$user = $this->login($username, $password) ) 4248 4248 return $this->error; 4249 4249 4250 $postdata = wp_get_single_post($post_ID, ARRAY_A);4250 $postdata = get_post($post_ID, ARRAY_A); 4251 4251 if ( ! $postdata ) 4252 4252 return new IXR_Error( 404, __( 'Invalid post ID.' ) ); 4253 4253 … … class wp_xmlrpc_server extends IXR_Server { 4827 4827 4828 4828 do_action('xmlrpc_call', 'mt.getTrackbackPings'); 4829 4829 4830 $actual_post = wp_get_single_post($post_ID, ARRAY_A);4830 $actual_post = get_post($post_ID, ARRAY_A); 4831 4831 4832 4832 if ( !$actual_post ) 4833 4833 return new IXR_Error(404, __('Sorry, no such post.')); … … class wp_xmlrpc_server extends IXR_Server { 4874 4874 4875 4875 do_action('xmlrpc_call', 'mt.publishPost'); 4876 4876 4877 $postdata = wp_get_single_post($post_ID, ARRAY_A);4877 $postdata = get_post($post_ID, ARRAY_A); 4878 4878 if ( ! $postdata ) 4879 4879 return new IXR_Error( 404, __( 'Invalid post ID.' ) ); 4880 4880 … … class wp_xmlrpc_server extends IXR_Server { 5088 5088 return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.')); 5089 5089 } 5090 5090 5091 $actual_post = wp_get_single_post($post_ID, ARRAY_A);5091 $actual_post = get_post($post_ID, ARRAY_A); 5092 5092 5093 5093 if ( !$actual_post ) { 5094 5094 // No such post = resource not found -
wp-includes/deprecated.php
diff --git wp-includes/deprecated.php wp-includes/deprecated.php index def4722..3deb0e3 100644
function sticky_class( $post_id = null ) { 3203 3203 */ 3204 3204 function _get_post_ancestors( &$post ) { 3205 3205 _deprecated_function( __FUNCTION__, '3.5' ); 3206 } 3207 No newline at end of file 3206 } 3207 3208 /** 3209 * Retrieve a single post, based on post ID. 3210 * 3211 * Has categories in 'post_category' property or key. Has tags in 'tags_input' 3212 * property or key. 3213 * 3214 * @since 1.0.0 3215 * @deprecated 3.5.0 3216 * @see get_post() 3217 * 3218 * @param int $postid Post ID. 3219 * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A. 3220 * @return object|array Post object or array holding post contents and information 3221 */ 3222 function wp_get_single_post( $postid = 0, $mode = OBJECT ) { 3223 _deprecated_function( __FUNCTION__, '3.5', 'get_post()' ); 3224 return get_post( $postid, $mode, 'edit' ); 3225 } 3226 -
wp-includes/post.php
diff --git wp-includes/post.php wp-includes/post.php index 7aed6b5..e7de852 100644
final class WP_Post { 475 475 if ( 'ancestors' == $key ) 476 476 return true; 477 477 478 if ( 'page_template' == $key ) 479 return ( 'page' == $this->post_type ); 480 481 if ( 'post_category' == $key ) 482 return true; 483 484 if ( 'tags_input' == $key ) 485 return true; 486 478 487 return metadata_exists( 'post', $this->ID, $key ); 479 488 } 480 489 481 490 public function &__get( $key ) { 491 if ( 'page_template' == $key && $this->__isset( $key ) ) { 492 $_ref = get_post_meta( $this->ID, '_wp_page_template', true ); 493 } 494 495 if ( 'post_category' == $key ) { 496 if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) { 497 $_ref = wp_get_post_categories( $this->ID ); 498 } else { 499 $_ref = array(); 500 } 501 } 502 503 if ( 'tags_input' == $key ) { 504 if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) { 505 $_ref = wp_get_post_tags( $this->ID, array( 'fields' => 'names' ) ); 506 } else { 507 $_ref = array(); 508 } 509 } 510 511 if ( isset( $_ref ) ) 512 return $_ref; 513 514 // Rest of the values need filtering 515 482 516 if ( 'ancestors' == $key ) { 483 517 $value = get_post_ancestors( $this ); 484 518 } else { … … final class WP_Post { 504 538 505 539 public function to_array() { 506 540 $post = get_object_vars( $this ); 507 $post['ancestors'] = array(); 541 542 foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) { 543 if ( $this->__isset( $key ) ) 544 $post[ $key ] = $this->__get( $key ); 545 } 508 546 509 547 return $post; 510 548 } … … function wp_trash_post($post_id = 0) { 2226 2264 if ( !EMPTY_TRASH_DAYS ) 2227 2265 return wp_delete_post($post_id, true); 2228 2266 2229 if ( !$post = wp_get_single_post($post_id, ARRAY_A) )2267 if ( !$post = get_post($post_id, ARRAY_A) ) 2230 2268 return $post; 2231 2269 2232 2270 if ( $post['post_status'] == 'trash' ) … … function wp_trash_post($post_id = 0) { 2258 2296 * @return mixed False on failure 2259 2297 */ 2260 2298 function wp_untrash_post($post_id = 0) { 2261 if ( !$post = wp_get_single_post($post_id, ARRAY_A) )2299 if ( !$post = get_post($post_id, ARRAY_A) ) 2262 2300 return $post; 2263 2301 2264 2302 if ( $post['post_status'] != 'trash' ) … … function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) { 2489 2527 } 2490 2528 2491 2529 /** 2492 * Retrieve a single post, based on post ID.2493 *2494 * Has categories in 'post_category' property or key. Has tags in 'tags_input'2495 * property or key.2496 *2497 * @since 1.0.02498 *2499 * @param int $postid Post ID.2500 * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.2501 * @return object|array Post object or array holding post contents and information2502 */2503 function wp_get_single_post($postid = 0, $mode = OBJECT) {2504 $postid = (int) $postid;2505 2506 $post = get_post($postid, $mode);2507 2508 if (2509 ( OBJECT == $mode && empty( $post->ID ) ) ||2510 ( OBJECT != $mode && empty( $post['ID'] ) )2511 )2512 return ( OBJECT == $mode ? null : array() );2513 2514 // Set categories and tags2515 if ( $mode == OBJECT ) {2516 $post->post_category = array();2517 if ( is_object_in_taxonomy($post->post_type, 'category') )2518 $post->post_category = wp_get_post_categories($postid);2519 $post->tags_input = array();2520 if ( is_object_in_taxonomy($post->post_type, 'post_tag') )2521 $post->tags_input = wp_get_post_tags($postid, array('fields' => 'names'));2522 } else {2523 $post['post_category'] = array();2524 if ( is_object_in_taxonomy($post['post_type'], 'category') )2525 $post['post_category'] = wp_get_post_categories($postid);2526 $post['tags_input'] = array();2527 if ( is_object_in_taxonomy($post['post_type'], 'post_tag') )2528 $post['tags_input'] = wp_get_post_tags($postid, array('fields' => 'names'));2529 }2530 2531 return $post;2532 }2533 2534 /**2535 2530 * Insert a post. 2536 2531 * 2537 2532 * If the $postarr parameter has 'ID' set to a value, then post will be updated. … … function wp_update_post( $postarr = array(), $wp_error = false ) { 2832 2827 } 2833 2828 2834 2829 // First, get all of the original fields 2835 $post = wp_get_single_post($postarr['ID'], ARRAY_A);2830 $post = get_post($postarr['ID'], ARRAY_A); 2836 2831 2837 2832 // Escape data pulled from DB. 2838 2833 $post = add_magic_quotes($post); … … function get_to_ping($post_id) { 3241 3236 function trackback_url_list($tb_list, $post_id) { 3242 3237 if ( ! empty( $tb_list ) ) { 3243 3238 // get post data 3244 $postdata = wp_get_single_post($post_id, ARRAY_A);3239 $postdata = get_post($post_id, ARRAY_A); 3245 3240 3246 3241 // import postdata as variables 3247 3242 extract($postdata, EXTR_SKIP);