Changeset 8011 for trunk/wp-includes/post.php

Timestamp:

05/29/2008 10:21:36 PM (17 years ago)

Author:

ryan

Message:

Post revisions API cleanup from mdawaffe. see #6775

File:

• trunk/wp-includes/post.php (modified) (24 diffs)

trunk/wp-includes/post.php

@@ -957 +957 @@
     // Do raw query.  wp_get_post_revisions() is filtered
     $revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
-    // Use wp_delete_post (via wp_delete_revision) again.  Ensures any meta/misplaced data gets cleaned up.
+    // Use wp_delete_post (via wp_delete_post_revision) again.  Ensures any meta/misplaced data gets cleaned up.
     foreach ( $revision_ids as $revision_id )
-        wp_delete_revision( $revision_id );
+        wp_delete_post_revision( $revision_id );
 
     // Point all attachments to this post up one level
@@ -2952 +2952 @@
 
 /**
- * _wp_revision_fields() - determines which fields of posts are to be saved in revisions
+ * _wp_post_revision_fields() - determines which fields of posts are to be saved in revisions
  *
  * Does two things. If passed a post *array*, it will return a post array ready to be
@@ -2966 +2966 @@
  * @return array post array ready to be inserted as a post revision or array of fields that can be versioned
  */
-function _wp_revision_fields( $post = null, $autosave = false ) {
+function _wp_post_revision_fields( $post = null, $autosave = false ) {
     static $fields = false;
 
@@ -2979 +2979 @@
 
         // Runs only once
-        $fields = apply_filters( '_wp_revision_fields', $fields );
+        $fields = apply_filters( '_wp_post_revision_fields', $fields );
 
         // WP uses these internally either in versioning or elsewhere - they cannot be versioned
@@ -3004 +3004 @@
 
 /**
- * wp_save_revision() - Saves an already existing post as a post revision.  Typically used immediately prior to post updates.
+ * wp_save_post_revision() - Saves an already existing post as a post revision.  Typically used immediately prior to post updates.
  *
  * @package WordPress
@@ -3010 +3010 @@
  * @since 2.6
  *
- * @uses _wp_put_revision()
+ * @uses _wp_put_post_revision()
  *
  * @param int $post_id The ID of the post to save as a revision
  * @return mixed null or 0 if error, new revision ID if success
  */
-function wp_save_revision( $post_id ) {
-    // We do autosaves manually with wp_create_autosave()
+function wp_save_post_revision( $post_id ) {
+    // We do autosaves manually with wp_create_post_autosave()
     if ( @constant( 'DOING_AUTOSAVE' ) )
         return;
@@ -3030 +3030 @@
         return;
 
-    $return = _wp_put_revision( $post );
+    $return = _wp_put_post_revision( $post );
 
     // WP_POST_REVISIONS = true (default), -1
@@ -3050 +3050 @@
         if ( false !== strpos( $revisions[$i]->post_name, 'autosave' ) )
             continue;
-        wp_delete_revision( $revisions[$i]->ID );
+        wp_delete_post_revision( $revisions[$i]->ID );
     }
 
@@ -3057 +3057 @@
 
 /**
- * wp_get_autosave() - returns the autosaved data of the specified post.
+ * wp_get_post_autosave() - returns the autosaved data of the specified post.
  *
  * Returns a post object containing the information that was autosaved for the specified post.
@@ -3068 +3068 @@
  * @return object|bool the autosaved data or false on failure or when no autosave exists
  */
-function wp_get_autosave( $post_id ) {
+function wp_get_post_autosave( $post_id ) {
     global $wpdb;
     if ( !$post = get_post( $post_id ) )
@@ -3083 +3083 @@
     $autosave_query = new WP_Query;
 
-    add_action( 'parse_query', '_wp_get_autosave_hack' );
+    add_action( 'parse_query', '_wp_get_post_autosave_hack' );
     $autosave = $autosave_query->query( $q );
-    remove_action( 'parse_query', '_wp_get_autosave_hack' );
+    remove_action( 'parse_query', '_wp_get_post_autosave_hack' );
 
     if ( $autosave && is_array($autosave) && is_object($autosave[0]) )
@@ -3094 +3094 @@
 
 // Internally used to hack WP_Query into submission
-function _wp_get_autosave_hack( $query ) {
+function _wp_get_post_autosave_hack( $query ) {
     $query->is_single = false;
 }
 
-/**
- * _wp_put_revision() - Inserts post data into the posts table as a post revision
+
+/**
+ * wp_is_post_revision() - Determines if the specified post is a revision.
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @param int|object $post post ID or post object
+ * @return bool|int false if not a revision, ID of revision's parent otherwise
+ */
+function wp_is_post_revision( $post ) {
+    if ( !$post = wp_get_post_revision( $post ) )
+        return false;
+    return (int) $post->post_parent;
+}
+
+/**
+ * wp_is_post_autosave() - Determines if the specified post is an autosave.
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @param int|object $post post ID or post object
+ * @return bool|int false if not a revision, ID of autosave's parent otherwise
+ */
+function wp_is_post_autosave( $post ) {
+    if ( !$post = wp_get_post_revision( $post ) )
+        return false;
+    if ( "{$post->post_parent}-autosave" !== $post->post_name )
+        return false;
+    return (int) $post->post_parent;
+}
+
+/**
+ * _wp_put_post_revision() - Inserts post data into the posts table as a post revision
  *
  * @package WordPress
@@ -3111 +3146 @@
  * @return mixed null or 0 if error, new revision ID if success
  */
-function _wp_put_revision( $post = null, $autosave = false ) {
+function _wp_put_post_revision( $post = null, $autosave = false ) {
     if ( is_object($post) )
         $post = get_object_vars( $post );
@@ -3122 +3157 @@
         return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
 
-    $post = _wp_revision_fields( $post, $autosave );
+    $post = _wp_post_revision_fields( $post, $autosave );
 
     $revision_id = wp_insert_post( $post );
@@ -3129 +3164 @@
 
     if ( $revision_id )
-        do_action( '_wp_put_revision', $revision_id );
+        do_action( '_wp_put_post_revision', $revision_id );
     return $revision_id;
 }
 
 /**
- * wp_get_revision() - Gets a post revision
+ * wp_get_post_revision() - Gets a post revision
  *
  * @package WordPress
@@ -3147 +3182 @@
  * @return mixed null if error or post object if success
  */
-function &wp_get_revision(&$post, $output = OBJECT, $filter = 'raw') {
+function &wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
     $null = null;
     if ( !$revision = get_post( $post, OBJECT, $filter ) )
@@ -3168 +3203 @@
 
 /**
- * wp_restore_revision() - Restores a post to the specified revision
+ * wp_restore_post_revision() - Restores a post to the specified revision
  *
  * Can restore a past using all fields of the post revision, or only selected fields.
@@ -3176 +3211 @@
  * @since 2.6
  *
- * @uses wp_get_revision()
+ * @uses wp_get_post_revision()
  * @uses wp_update_post()
  *
@@ -3183 +3218 @@
  * @return mixed null if error, false if no fields to restore, (int) post ID if success
  */
-function wp_restore_revision( $revision_id, $fields = null ) {
-    if ( !$revision = wp_get_revision( $revision_id, ARRAY_A ) )
+function wp_restore_post_revision( $revision_id, $fields = null ) {
+    if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
         return $revision;
 
     if ( !is_array( $fields ) )
-        $fields = array_keys( _wp_revision_fields() );
+        $fields = array_keys( _wp_post_revision_fields() );
 
     $update = array();
@@ -3204 +3239 @@
 
     if ( $post_id )
-        do_action( 'wp_restore_revision', $post_id, $revision['ID'] );
+        do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
 
     return $post_id;
@@ -3210 +3245 @@
 
 /**
- * wp_delete_revision() - Deletes a revision.
+ * wp_delete_post_revision() - Deletes a revision.
  *
  * Deletes the row from the posts table corresponding to the specified revision
@@ -3218 +3253 @@
  * @since 2.6
  *
- * @uses wp_get_revision()
+ * @uses wp_get_post_revision()
  * @uses wp_delete_post()
  *
@@ -3225 +3260 @@
  * @return mixed null if error, false if no fields to restore, (int) post ID if success
  */
-function wp_delete_revision( $revision_id ) {
-    if ( !$revision = wp_get_revision( $revision_id ) )
+function wp_delete_post_revision( $revision_id ) {
+    if ( !$revision = wp_get_post_revision( $revision_id ) )
         return $revision;
 
@@ -3234 +3269 @@
 
     if ( $delete )
-        do_action( 'wp_delete_revision', $revision->ID, $revision );
+        do_action( 'wp_delete_post_revision', $revision->ID, $revision );
 
     return $delete;