enmi-conf.org: comparison wp/wp-includes/revision.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 *
 * @since 2.6.0
 * @since 4.5.0 A `WP_Post` object can now be passed to the `$post` parameter.
 * @since 4.5.0 The optional `$autosave` parameter was deprecated and renamed to `$deprecated`.
 * @access private
-*
-* @staticvar array $fields
 *
 * @param array|WP_Post $post       Optional. A post array or a WP_Post object being processed
 *                                  for insertion as a post revision. Default empty array.
 * @param bool          $deprecated Not used.
 * @return array Array of fields that can be versioned.
 	if ( ! is_array( $post ) ) {
 		$post = get_post( $post, ARRAY_A );
 	}
 	if ( is_null( $fields ) ) {
-		// Allow these to be versioned
+		// Allow these to be versioned.
 		$fields = array(
 			'post_title'   => __( 'Title' ),
 			'post_content' => __( 'Content' ),
 			'post_excerpt' => __( 'Excerpt' ),
 		);
 	 *                      'post_content', and 'post_excerpt' by default.
 	 * @param array $post   A post array being processed for insertion as a post revision.
 	 */
 	$fields = apply_filters( '_wp_post_revision_fields', $fields, $post );
-	// WP uses these internally either in versioning or elsewhere - they cannot be versioned
+	// WP uses these internally either in versioning or elsewhere - they cannot be versioned.
 	foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) {
 		unset( $fields[ $protect ] );
 	}
 	return $fields;
 	}
 	$revision_data['post_parent']   = $post['ID'];
 	$revision_data['post_status']   = 'inherit';
 	$revision_data['post_type']     = 'revision';
-	$revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version
+	$revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version.
 	$revision_data['post_date']     = isset( $post['post_modified'] ) ? $post['post_modified'] : '';
 	$revision_data['post_date_gmt'] = isset( $post['post_modified_gmt'] ) ? $post['post_modified_gmt'] : '';
 	return $revision_data;
 }
 function wp_save_post_revision( $post_id ) {
 	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 		return;
 	}
-	if ( ! $post = get_post( $post_id ) ) {
+	$post = get_post( $post_id );
+	if ( ! $post ) {
 		return;
 	}
 	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
 		return;
 	}
-	if ( 'auto-draft' == $post->post_status ) {
+	if ( 'auto-draft' === $post->post_status ) {
 		return;
 	}
 	if ( ! wp_revisions_enabled( $post ) ) {
 		return;
 	}
-	// Compare the proposed update with the last stored revision verifying that
+	/*
-	// they are different, unless a plugin tells us to always save regardless.
+	 * Compare the proposed update with the last stored revision verifying that
-	// If no previous revisions, save one
+	 * they are different, unless a plugin tells us to always save regardless.
-	if ( $revisions = wp_get_post_revisions( $post_id ) ) {
+	 * If no previous revisions, save one.
-		// grab the last revision, but not an autosave
+	 */
+	$revisions = wp_get_post_revisions( $post_id );
+	if ( $revisions ) {
+		// Grab the last revision, but not an autosave.
 		foreach ( $revisions as $revision ) {
 			if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
 				$last_revision = $revision;
 				break;
 			}
 		 * @param bool    $check_for_changes Whether to check for changes before saving a new revision.
 		 *                                   Default true.
 		 * @param WP_Post $last_revision     The last revision post object.
 		 * @param WP_Post $post              The post object.
 		 */
-		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
+		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', true, $last_revision, $post ) ) {
 			$post_has_changed = false;
 			foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {
-				if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) {
+				if ( normalize_whitespace( $post->$field ) !== normalize_whitespace( $last_revision->$field ) ) {
 					$post_has_changed = true;
 					break;
 				}
 			}
 			 * @param WP_Post $last_revision    The last revision post object.
 			 * @param WP_Post $post             The post object.
 			 */
 			$post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
-			//don't save revision if post unchanged
+			// Don't save revision if post unchanged.
 			if ( ! $post_has_changed ) {
 				return;
 			}
 		}
 	}
 }
 /**
 * Retrieve the autosaved data of the specified post.
 *
-* Returns a post object containing the information that was autosaved for the
+* Returns a post object with the information that was autosaved for the specified post.
-* specified post. If the optional $user_id is passed, returns the autosave for that user
+* If the optional $user_id is passed, returns the autosave for that user, otherwise
-* otherwise returns the latest autosave.
+* returns the latest autosave.
 *
 * @since 2.6.0
 *
 * @param int $post_id The post ID.
 * @param int $user_id Optional The post author ID.
 * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
 */
 function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-	$revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
+	global $wpdb;
-	foreach ( $revisions as $revision ) {
+	$autosave_name = $post_id . '-autosave-v1';
-		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
+	$user_id_query = ( 0 !== $user_id ) ? "AND post_author = $user_id" : null;
-			if ( $user_id && $user_id != $revision->post_author ) {
-				continue;
+	// Construct the autosave query.
-			}
+	$autosave_query = "
+		SELECT *
-			return $revision;
+		FROM $wpdb->posts
-		}
+		WHERE post_parent = %d
-	}
+		AND post_type = 'revision'
+		AND post_status = 'inherit'
-	return false;
+		AND post_name   = %s " . $user_id_query . '
+		ORDER BY post_date DESC
+		LIMIT 1';
+	$autosave = $wpdb->get_results(
+		$wpdb->prepare(
+			$autosave_query,
+			$post_id,
+			$autosave_name
+		)
+	);
+	if ( ! $autosave ) {
+		return false;
+	}
+	return get_post( $autosave[0] );
 }
 /**
 * Determines if the specified post is a revision.
 *
 * @since 2.6.0
 *
 * @param int|WP_Post $post Post ID or post object.
-* @return false|int False if not a revision, ID of revision's parent otherwise.
+* @return int|false ID of revision's parent on success, false if not a revision.
 */
 function wp_is_post_revision( $post ) {
-	if ( ! $post = wp_get_post_revision( $post ) ) {
+	$post = wp_get_post_revision( $post );
+	if ( ! $post ) {
 		return false;
 	}
 	return (int) $post->post_parent;
 }
 * Determines if the specified post is an autosave.
 *
 * @since 2.6.0
 *
 * @param int|WP_Post $post Post ID or post object.
-* @return false|int False if not a revision, ID of autosave's parent otherwise
+* @return int|false ID of autosave's parent on success, false if not a revision.
 */
 function wp_is_post_autosave( $post ) {
-	if ( ! $post = wp_get_post_revision( $post ) ) {
+	$post = wp_get_post_revision( $post );
+	if ( ! $post ) {
 		return false;
 	}
 	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
 		return (int) $post->post_parent;
 	if ( ! $post || empty( $post['ID'] ) ) {
 		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
 	}
-	if ( isset( $post['post_type'] ) && 'revision' == $post['post_type'] ) {
+	if ( isset( $post['post_type'] ) && 'revision' === $post['post_type'] ) {
 		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
 	}
 	$post = _wp_post_revision_data( $post, $autosave );
-	$post = wp_slash( $post ); //since data is from db
+	$post = wp_slash( $post ); // Since data is from DB.
 	$revision_id = wp_insert_post( $post );
 	if ( is_wp_error( $revision_id ) ) {
 		return $revision_id;
 	}
 * Gets a post revision.
 *
 * @since 2.6.0
 *
 * @param int|WP_Post $post   The post ID or object.
-* @param string      $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
+* @param string      $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
-*                            a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
+*                            correspond to a WP_Post object, an associative array, or a numeric array,
+*                            respectively. Default OBJECT.
 * @param string      $filter Optional sanitation filter. See sanitize_post().
 * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
 */
 function wp_get_post_revision( &$post, $output = OBJECT, $filter = 'raw' ) {
-	if ( ! $revision = get_post( $post, OBJECT, $filter ) ) {
+	$revision = get_post( $post, OBJECT, $filter );
+	if ( ! $revision ) {
 		return $revision;
 	}
 	if ( 'revision' !== $revision->post_type ) {
 		return null;
 	}
-	if ( $output == OBJECT ) {
+	if ( OBJECT == $output ) {
 		return $revision;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ( ARRAY_A == $output ) {
 		$_revision = get_object_vars( $revision );
 		return $_revision;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ( ARRAY_N == $output ) {
 		$_revision = array_values( get_object_vars( $revision ) );
 		return $_revision;
 	}
 	return $revision;
 * @param int|WP_Post $revision_id Revision ID or revision object.
 * @param array       $fields      Optional. What fields to restore from. Defaults to all.
 * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
 */
 function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( ! $revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) {
+	$revision = wp_get_post_revision( $revision_id, ARRAY_A );
+	if ( ! $revision ) {
 		return $revision;
 	}
 	if ( ! is_array( $fields ) ) {
 		$fields = array_keys( _wp_post_revision_fields( $revision ) );
 		return false;
 	}
 	$update['ID'] = $revision['post_parent'];
-	$update = wp_slash( $update ); //since data is from db
+	$update = wp_slash( $update ); // Since data is from DB.
 	$post_id = wp_update_post( $update );
 	if ( ! $post_id || is_wp_error( $post_id ) ) {
 		return $post_id;
 	}
-	// Update last edit user
+	// Update last edit user.
 	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
 	/**
 	 * Fires after a post revision has been restored.
 	 *
 *
 * @param int|WP_Post $revision_id Revision ID or revision object.
 * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success.
 */
 function wp_delete_post_revision( $revision_id ) {
-	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+	$revision = wp_get_post_revision( $revision_id );
+	if ( ! $revision ) {
 		return $revision;
 	}
 	$delete = wp_delete_post( $revision->ID );
 	if ( $delete ) {
 		/**
 		 * Fires once a post revision has been deleted.
 		 *
 		 * @since 2.6.0
 		 *
-		 * @param int          $revision_id Post revision ID.
+		 * @param int     $revision_id Post revision ID.
-		 * @param object|array $revision    Post revision object or array.
+		 * @param WP_Post $revision    Post revision object.
 		 */
 		do_action( 'wp_delete_post_revision', $revision->ID, $revision );
 	}
 	return $delete;
 			'post_type'   => 'revision',
 			'post_status' => 'inherit',
 		)
 	);
-	if ( ! $revisions = get_children( $args ) ) {
+	$revisions = get_children( $args );
+	if ( ! $revisions ) {
 		return array();
 	}
 	return $revisions;
 }
 * @param int    $post_id
 * @param string $taxonomy
 * @return array
 */
 function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() ) {
+	$post = get_post();
+	if ( ! $post ) {
 		return $terms;
 	}
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id
+		|| 'post_format' !== $taxonomy || 'revision' === $post->post_type
+	) {
 		return $terms;
 	}
-	if ( 'standard' == $_REQUEST['post_format'] ) {
+	if ( 'standard' === $_REQUEST['post_format'] ) {
 		$terms = array();
-	} elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) ) {
+	} else {
-		$terms = array( $term ); // Can only have one post format
+		$term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' );
+		if ( $term ) {
+			$terms = array( $term ); // Can only have one post format.
+		}
 	}
 	return $terms;
 }
 * @param int               $post_id  Post ID.
 * @param string            $meta_key Meta key.
 * @return null|array The default return value or the post thumbnail meta array.
 */
 function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
-	if ( ! $post = get_post() ) {
+	$post = get_post();
+	if ( ! $post ) {
 		return $value;
 	}
 	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
 		empty( $_REQUEST['preview_id'] ) ||
 		$post->ID != $post_id ||
-		'_thumbnail_id' != $meta_key ||
+		'_thumbnail_id' !== $meta_key ||
-		'revision' == $post->post_type ||
+		'revision' === $post->post_type ||
 		$post_id != $_REQUEST['preview_id'] ) {
 		return $value;
 	}
 * @return bool true if the revisions were upgraded, false if problems
 */
 function _wp_upgrade_revisions_of_post( $post, $revisions ) {
 	global $wpdb;
-	// Add post option exclusively
+	// Add post option exclusively.
 	$lock   = "revision-upgrade-{$post->ID}";
 	$now    = time();
 	$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
 	if ( ! $result ) {
-		// If we couldn't get a lock, see how old the previous lock is
+		// If we couldn't get a lock, see how old the previous lock is.
 		$locked = get_option( $lock );
 		if ( ! $locked ) {
 			// Can't write to the lock, and can't read the lock.
-			// Something broken has happened
+			// Something broken has happened.
 			return false;
 		}
 		if ( $locked > $now - 3600 ) {
-			// Lock is not too old: some other process may be upgrading this post.  Bail.
+			// Lock is not too old: some other process may be upgrading this post. Bail.
 			return false;
 		}
-		// Lock is too old - update it (below) and continue
+		// Lock is too old - update it (below) and continue.
 	}
 	// If we could get a lock, re-"add" the option to fire all the correct filters.
 	update_option( $lock, $now );
 		$this_revision = current( $revisions );
 		$prev_revision = next( $revisions );
 		$this_revision_version = _wp_get_post_revision_version( $this_revision );
-		// Something terrible happened
+		// Something terrible happened.
 		if ( false === $this_revision_version ) {
 			continue;
 		}
 		// 1 is the latest revision version, so we're already up to date.
 		if ( 0 < $this_revision_version ) {
 			$add_last = false;
 			continue;
 		}
-		// Always update the revision version
+		// Always update the revision version.
 		$update = array(
 			'post_name' => preg_replace( '/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name ),
 		);
-		// If this revision is the oldest revision of the post, i.e. no $prev_revision,
+		/*
-		// the correct post_author is probably $post->post_author, but that's only a good guess.
+		 * If this revision is the oldest revision of the post, i.e. no $prev_revision,
-		// Update the revision version only and Leave the author as-is.
+		 * the correct post_author is probably $post->post_author, but that's only a good guess.
+		 * Update the revision version only and Leave the author as-is.
+		 */
 		if ( $prev_revision ) {
 			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
 			// If the previous revision is already up to date, it no longer has the information we need :(
 			if ( $prev_revision_version < 1 ) {
 				$update['post_author'] = $prev_revision->post_author;
 			}
 		}
-		// Upgrade this revision
+		// Upgrade this revision.
 		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
 		if ( $result ) {
 			wp_cache_delete( $this_revision->ID, 'posts' );
 		}

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a