Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-15 23:25:50 +01:00
Code Issues Projects Releases Wiki Activity

wp_insert_post() -- Validate page template, check return of insert and update queries, add option to return WP_Error. fixes #6227 see #6098

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@7900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-05-05 23:19:27 +00:00
parent ecc6151966
commit 15a9bac5ad
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
wp-includes/post.php
View File

@ -1109,7 +1109,7 @@ function wp_get_single_post($postid = 0, $mode = OBJECT) {
* @param array $postarr post contents * @param array $postarr post contents
* @return int post ID or 0 on error * @return int post ID or 0 on error
*/ */
function wp_insert_post($postarr = array()) { function wp_insert_post($postarr = array(), $wp_error = false) {
global $wpdb, $wp_rewrite, $user_ID; global $wpdb, $wp_rewrite, $user_ID;
$defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID, $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
@ -1132,8 +1132,12 @@ function wp_insert_post($postarr = array()) {
$previous_status = 'new'; $previous_status = 'new';
} }
if ( ('' == $post_content) && ('' == $post_title) && ('' == $post_excerpt) ) if ( ('' == $post_content) && ('' == $post_title) && ('' == $post_excerpt) ) {
if ( $wp_error )
return new WP_Error('empty_content', __('Content, title, and excerpt are empty.'));
else
return 0; return 0;
}
// Make sure we set a valid category // Make sure we set a valid category
if (0 == count($post_category) || !is_array($post_category)) { if (0 == count($post_category) || !is_array($post_category)) {
@ -1244,10 +1248,20 @@ function wp_insert_post($postarr = array()) {
if ($update) { if ($update) {
do_action( 'pre_post_update', $post_ID ); do_action( 'pre_post_update', $post_ID );
$wpdb->update( $wpdb->posts, $data, $where ); if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
if ( $wp_error )
return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error);
else
return 0;
}
} else { } else {
$data['post_mime_type'] = stripslashes( $post_mime_type ); // This isn't in the update $data['post_mime_type'] = stripslashes( $post_mime_type ); // This isn't in the update
$wpdb->insert( $wpdb->posts, $data ); if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
if ( $wp_error )
return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error);
else
return 0;
}
$post_ID = (int) $wpdb->insert_id; $post_ID = (int) $wpdb->insert_id;
// use the newly generated $post_ID // use the newly generated $post_ID
@ -1264,19 +1278,29 @@ function wp_insert_post($postarr = array()) {
$current_guid = get_post_field( 'guid', $post_ID ); $current_guid = get_post_field( 'guid', $post_ID );
if ( 'page' == $post_type ) { if ( 'page' == $post_type )
clean_page_cache($post_ID); clean_page_cache($post_ID);
} else { else
clean_post_cache($post_ID); clean_post_cache($post_ID);
}
// Set GUID // Set GUID
if ( !$update && '' == $current_guid ) if ( !$update && '' == $current_guid )
$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where ); $wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where );
$post = get_post($post_ID); $post = get_post($post_ID);
if ( !empty($page_template) )
if ( !empty($page_template) && 'page' == $post_type ) {
$post->page_template = $page_template; $post->page_template = $page_template;
$page_templates = get_page_templates();
if ( ! in_array($page_template, $page_templates) ) {
if ( $wp_error )
return new WP_Error('invalid_page_template', __('The page template is invalid.'));
else
return 0;
}
if ( ! update_post_meta($post_ID, '_wp_page_template', $page_template) )
add_post_meta($post_ID, '_wp_page_template', $page_template, true);
}
wp_transition_post_status($post_status, $previous_status, $post); wp_transition_post_status($post_status, $previous_status, $post);
@ -2897,10 +2921,6 @@ function _publish_post_hook($post_id) {
*/ */
function _save_post_hook($post_id, $post) { function _save_post_hook($post_id, $post) {
if ( $post->post_type == 'page' ) { if ( $post->post_type == 'page' ) {
if ( !empty($post->page_template) )
if ( ! update_post_meta($post_id, '_wp_page_template', $post->page_template))
add_post_meta($post_id, '_wp_page_template', $post->page_template, true);
clean_page_cache($post_id); clean_page_cache($post_id);
global $wp_rewrite; global $wp_rewrite;
$wp_rewrite->flush_rules(); $wp_rewrite->flush_rules();