X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..5d244c8fd9a27c9f89dd08da2af6fbc67d4fce63:/wp-admin/includes/post.php
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index d230667c..49060309 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -177,6 +177,7 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
* @return int Post ID.
*/
function edit_post( $post_data = null ) {
+ global $wpdb;
if ( empty($post_data) )
$post_data = &$_POST;
@@ -317,7 +318,19 @@ function edit_post( $post_data = null ) {
update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
- wp_update_post( $post_data );
+ $success = wp_update_post( $post_data );
+ // If the save failed, see if we can sanity check the main fields and try again
+ if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
+ $fields = array( 'post_title', 'post_content', 'post_excerpt' );
+
+ foreach( $fields as $field ) {
+ if ( isset( $post_data[ $field ] ) ) {
+ $post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
+ }
+ }
+
+ wp_update_post( $post_data );
+ }
// Now that we have an ID we can fix any attachment anchor hrefs
_fix_attachment_links( $post_ID );
@@ -542,6 +555,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
$post->post_date = '';
$post->post_date_gmt = '';
$post->post_password = '';
+ $post->post_name = '';
$post->post_type = $post_type;
$post->post_status = 'draft';
$post->to_ping = '';
@@ -585,7 +599,6 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
* @param WP_Post $post Post object.
*/
$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
- $post->post_name = '';
return $post;
}
@@ -636,7 +649,7 @@ function post_exists($title, $content = '', $date = '') {
*
* @since 2.1.0
*
- * @return unknown
+ * @return int|WP_Error
*/
function wp_write_post() {
if ( isset($_POST['post_type']) )
@@ -704,11 +717,8 @@ function wp_write_post() {
* Calls wp_write_post() and handles the errors.
*
* @since 2.0.0
-
- * @uses wp_write_post()
- * @uses is_wp_error()
- * @uses wp_die()
- * @return unknown
+ *
+ * @return int|null
*/
function write_post() {
$result = wp_write_post();
@@ -727,8 +737,8 @@ function write_post() {
*
* @since 1.2.0
*
- * @param unknown_type $post_ID
- * @return unknown
+ * @param int $post_ID
+ * @return int|bool
*/
function add_meta( $post_ID ) {
$post_ID = (int) $post_ID;
@@ -766,8 +776,8 @@ function add_meta( $post_ID ) {
*
* @since 1.2.0
*
- * @param unknown_type $mid
- * @return unknown
+ * @param int $mid
+ * @return bool
*/
function delete_meta( $mid ) {
return delete_metadata_by_mid( 'post' , $mid );
@@ -778,7 +788,7 @@ function delete_meta( $mid ) {
*
* @since 1.2.0
*
- * @return unknown
+ * @return mixed
*/
function get_meta_keys() {
global $wpdb;
@@ -797,8 +807,8 @@ function get_meta_keys() {
*
* @since 2.1.0
*
- * @param unknown_type $mid
- * @return unknown
+ * @param int $mid
+ * @return object|bool
*/
function get_post_meta_by_id( $mid ) {
return get_metadata_by_mid( 'post', $mid );
@@ -811,8 +821,8 @@ function get_post_meta_by_id( $mid ) {
*
* @since 1.2.0
*
- * @param unknown_type $postid
- * @return unknown
+ * @param int $postid
+ * @return mixed
*/
function has_meta( $postid ) {
global $wpdb;
@@ -827,10 +837,10 @@ function has_meta( $postid ) {
*
* @since 1.2.0
*
- * @param unknown_type $meta_id
- * @param unknown_type $meta_key Expect Slashed
- * @param unknown_type $meta_value Expect Slashed
- * @return unknown
+ * @param int $meta_id
+ * @param string $meta_key Expect Slashed
+ * @param string $meta_value Expect Slashed
+ * @return bool
*/
function update_meta( $meta_id, $meta_key, $meta_value ) {
$meta_key = wp_unslash( $meta_key );
@@ -955,7 +965,7 @@ function wp_edit_posts_query( $q = false ) {
/**
* Filter the number of items per page to show for a specific 'per_page' type.
*
- * The dynamic portion of the hook name, $post_type, refers to the post type.
+ * The dynamic portion of the hook name, `$post_type`, refers to the post type.
*
* Some examples of filter hooks generated here include: 'edit_attachment_per_page',
* 'edit_post_per_page', 'edit_page_per_page', etc.
@@ -1000,8 +1010,8 @@ function wp_edit_posts_query( $q = false ) {
*
* @since 2.5.0
*
- * @param unknown_type $type
- * @return unknown
+ * @param string $type
+ * @return mixed
*/
function get_available_post_mime_types($type = 'attachment') {
global $wpdb;
@@ -1072,12 +1082,11 @@ function wp_edit_attachments_query( $q = false ) {
/**
* Returns the list of classes to be used by a metabox
*
- * @uses get_user_option()
* @since 2.5.0
*
- * @param unknown_type $id
- * @param unknown_type $page
- * @return unknown
+ * @param string $id
+ * @param string $page
+ * @return string
*/
function postbox_classes( $id, $page ) {
if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) {
@@ -1095,8 +1104,8 @@ function postbox_classes( $id, $page ) {
/**
* Filter the postbox classes for a specific screen and screen ID combo.
*
- * The dynamic portions of the hook name, $page, and $id, refer to
- * the screen, and screen ID, respectively.
+ * The dynamic portions of the hook name, `$page` and `$id`, refer to
+ * the screen and screen ID, respectively.
*
* @since 3.2.0
*
@@ -1107,14 +1116,14 @@ function postbox_classes( $id, $page ) {
}
/**
- * {@internal Missing Short Description}}
+ * Get a sample permalink based off of the post name.
*
* @since 2.5.0
*
- * @param int|object $id Post ID or post object.
- * @param string $title (optional) Title
- * @param string $name (optional) Name
- * @return array With two entries of type string
+ * @param int $id Post ID or post object.
+ * @param string $title Optional. Title. Default null.
+ * @param string $name Optional. Name. Default null.
+ * @return array Array with two entries of type string.
*/
function get_sample_permalink($id, $title = null, $name = null) {
$post = get_post( $id );
@@ -1176,9 +1185,9 @@ function get_sample_permalink($id, $title = null, $name = null) {
*
* @since 2.5.0
*
- * @param int|object $id Post ID or post object.
- * @param string $new_title Optional. New title.
- * @param string $new_slug Optional. New slug.
+ * @param int $id Post ID or post object.
+ * @param string $new_title Optional. New title. Default null.
+ * @param string $new_slug Optional. New slug. Default null.
* @return string The HTML of the sample permalink slug editor.
*/
function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
@@ -1205,16 +1214,22 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
$return .= '' . __('Change Permalinks') . "\n";
}
} else {
- if ( function_exists( 'mb_strlen' ) && mb_strlen( $post_name ) > 30 ) {
- $post_name_abridged = mb_substr( $post_name, 0, 14 ) . '…' . mb_substr( $post_name, -14 );
- } elseif ( strlen( $post_name ) > 30 ) {
- $post_name_abridged = substr( $post_name, 0, 14 ) . '…' . substr( $post_name, -14 );
+ if ( function_exists( 'mb_strlen' ) ) {
+ if ( mb_strlen( $post_name ) > 30 ) {
+ $post_name_abridged = mb_substr( $post_name, 0, 14 ) . '…' . mb_substr( $post_name, -14 );
+ } else {
+ $post_name_abridged = $post_name;
+ }
} else {
- $post_name_abridged = $post_name;
+ if ( strlen( $post_name ) > 30 ) {
+ $post_name_abridged = substr( $post_name, 0, 14 ) . '…' . substr( $post_name, -14 );
+ } else {
+ $post_name_abridged = $post_name;
+ }
}
$post_name_html = '' . $post_name_abridged . '';
- $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, $permalink );
+ $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
$return = '' . __( 'Permalink:' ) . "\n";
$return .= '' . $display_link . "\n";
@@ -1299,7 +1314,7 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
* @since 2.5.0
*
* @param int $post_id ID of the post to check for editing
- * @return bool|int False: not locked or locked by current user. Int: user ID of user with lock.
+ * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
*/
function wp_check_post_lock( $post_id ) {
if ( !$post = get_post( $post_id ) )
@@ -1503,9 +1518,6 @@ function _admin_notice_post_locked() {
* @subpackage Post_Revisions
* @since 2.6.0
*
- * @uses _wp_translate_postdata()
- * @uses _wp_post_revision_fields()
- *
* @param mixed $post_data Associative array containing the post data or int post ID.
* @return mixed The autosave revision ID. WP_Error or 0 on error.
*/
@@ -1544,6 +1556,15 @@ function wp_create_post_autosave( $post_data ) {
return 0;
}
+ /**
+ * Fires before an autosave is stored.
+ *
+ * @since 4.1.0
+ *
+ * @param array $new_autosave Post array - the autosave that is about to be saved.
+ */
+ do_action( 'wp_creating_autosave', $new_autosave );
+
return wp_update_post( $new_autosave );
}
@@ -1560,15 +1581,6 @@ function wp_create_post_autosave( $post_data ) {
* @package WordPress
* @since 2.7.0
*
- * @uses get_post_status()
- * @uses edit_post()
- * @uses get_post()
- * @uses current_user_can()
- * @uses wp_die()
- * @uses wp_create_post_autosave()
- * @uses add_query_arg()
- * @uses wp_create_nonce()
- *
* @return str URL to redirect to show the preview
*/
function post_preview() {
@@ -1623,7 +1635,7 @@ function post_preview() {
*
* @since 3.9.0
*
- * @param $post_data Associative array of the submitted post data.
+ * @param array $post_data Associative array of the submitted post data.
* @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
* Te ID can be the draft post_id or the autosave revision post_id.
*/