Changeset 8011

Timestamp:

05/29/08 22:21:36 (5 months ago)

Author:

ryan

Message:

Post revisions API cleanup from mdawaffe. see #6775

Files:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)
• trunk/wp-admin/edit-form-advanced.php (modified) (1 diff)
• trunk/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-admin/includes/post.php (modified) (4 diffs)
• trunk/wp-admin/revision.php (modified) (9 diffs)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/post-template.php (modified) (3 diffs)
• trunk/wp-includes/post.php (modified) (24 diffs)

trunk/wp-admin/admin-ajax.php

@@ -520 +520 @@
-                $id = edit_post();
-            } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
-
+post_
-                if ( is_wp_error($revision_id) )
-                    $id = $revision_id;

trunk/wp-admin/edit-form-advanced.php

@@ -22 +22 @@
-    $form_action = 'editpost';
-    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
-
+post_
-    if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) )
-        $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );

trunk/wp-admin/edit-page-form.php

@@ -20 +20 @@
-    $nonce_action = 'update-page_' . $post_ID;
-    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
-
+post_
-    if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) )
-        $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );

trunk/wp-admin/includes/post.php

@@ -650 +650 @@
-
-/**
-
+post_
- *
- * @package WordPress
@@ -657 +657 @@
- *
- * @uses _wp_translate_postdata()
-
+post_
- */
-
+post_
-    $translated = _wp_translate_postdata( true );
-    if ( is_wp_error( $translated ) )
@@ -665 +665 @@
-
-    // Only store one autosave.  If there is already an autosave, overwrite it.
-
-
+post_
+post_
-        $new_autosave['ID'] = $old_autosave->ID;
-        return wp_update_post( $new_autosave );
@@ -672 +672 @@
-
-    // Otherwise create the new autosave as a special post revision
-
-
+post_
+

trunk/wp-admin/revision.php

@@ -2 +2 @@
-
-require_once('admin.php');
-
-if ( !constant('WP_POST_REVISIONS') ) {
-    wp_redirect( 'edit.php' );
-    exit;
-}
-
-wp_reset_vars(array('revision', 'left', 'right', 'action'));
@@ -19 +14 @@
-case 'delete' : // stubs
-case 'edit' :
-
+
+
+
+
-    break;
-case 'restore' :
+    if ( !$revision = wp_get_post_revision( $revision_id ) )
+        break;
-    if ( !current_user_can( 'edit_post', $revision->post_parent ) )
-        break;
-    if ( !$revision = wp_get_revision( $revision_id ) )
-        break;
-    if ( !$post = get_post( $revision->post_parent ) )
-        break;
-
+    if ( !constant('WP_POST_REVISIONS') && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
+        break;
+
-    check_admin_referer( "restore-post_$post->ID|$revision->ID" );
-
-
+post_
-    $redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-    break;
@@ -58 +59 @@
-        break; // Don't diff two unrelated revisions
-
+    if ( !constant('WP_POST_REVISIONS') ) { // Revisions disabled
+        if (
+            // we're not looking at an autosave
+            ( !wp_is_post_autosave( $left_revision ) && !wp_is_post_autosave( $right_revision ) )
+        ||
+            // we're not comparing an autosave to the current post
+            ( $post->ID !== $left_revision->ID && $post->ID !== $right_revision->ID )
+        )
+            break;
+    }
+
-    if (
-        // They're the same
@@ -63 +75 @@
-    ||
-        // Neither is a revision
-revision( $left_revision->ID ) && !wp_ge
+post_revision( $left_revision->ID ) && !wp_get_pos
-    )
-        break;
@@ -77 +89 @@
-case 'view' :
-default :
-
+post_
-        break;
-    if ( !$post = get_post( $revision->post_parent ) )
@@ -83 +95 @@
-
-    if ( !current_user_can( 'read_post', $revision->ID ) || !current_user_can( 'read_post', $post->ID ) )
+        break;
+
+    if ( !constant('WP_POST_REVISIONS') && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
-        break;
-
@@ -114 +129 @@
-
-// Converts post_author ID# into name
-
+post_
-
-require_once( 'admin-header.php' );
@@ -138 +153 @@
-// use get_post_to_edit filters? 
-$identical = true;
-
+post_
-    if ( 'diff' == $action ) {
-
-
+post_
+post_
-        if ( !$content = wp_text_diff( $left_content, $right_content ) )
-            continue; // There is no difference between left and right
-        $identical = false;
-    } else {
-
-
+post_
+post_
-    }
-    ?>
@@ -180 +195 @@
-<?php
-
-
+
+
+
+
+
-
-require_once( 'admin-footer.php' );

trunk/wp-includes/default-filters.php

@@ -180 +180 @@
-add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
-add_action( 'shutdown', 'wp_ob_end_flush_all', 1);
-
+post_
-add_action('publish_post', '_publish_post_hook', 5, 1);
-add_action('future_post', '_future_post_hook', 5, 2);

trunk/wp-includes/post-template.php

@@ -594 +594 @@
-        $date = "<a href='$link'>$date</a>";
-
-'revision' != $revision->post_type
+!wp_is_post_revision( $revision )
-        $date = sprintf( $currentf, $date );
-"{$revision->post_parent}-autosave" == $revision->post_name
+wp_is_post_autosave( $revision )
-        $date = sprintf( $autosavef, $date );
-
@@ -629 +629 @@
-        return;
-
-
-
-
-
+
-    extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
+
+    switch ( $type ) {
+    case 'autosave' :
+        if ( !$autosave = wp_get_post_autosave( $post->ID ) )
+            return;
+        $revisions = array( $autosave );
+        break;
+    case 'revision' : // just revisions - remove autosave later
+    case 'all' :
+    default :
+        if ( !$revisions = wp_get_post_revisions( $post->ID ) )
+            return;
+        break;
+    }
-
-    $titlef = _c( '%1$s by %2$s|post revision 1:datetime, 2:name' );
@@ -645 +656 @@
-    foreach ( $revisions as $revision ) {
-        if ( !current_user_can( 'read_post', $revision->ID ) )
+            continue;
+        if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
-            continue;
-

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 ) );
-
+post_
-    foreach ( $revision_ids as $revision_id )
-
+post_
-
-    // Point all attachments to this post up one level
@@ -2952 +2952 @@
-
-/**
-
+post_
- *
- * 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
- */
-
+post_
-    static $fields = false;
-
@@ -2979 +2979 @@
-
-        // Runs only once
-
+post_
-
-        // WP uses these internally either in versioning or elsewhere - they cannot be versioned
@@ -3004 +3004 @@
-
-/**
-
+post_
- *
- * @package WordPress
@@ -3010 +3010 @@
- * @since 2.6
- *
-
+post_
- *
- * @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
- */
-
-
+post_
+post_
-    if ( @constant( 'DOING_AUTOSAVE' ) )
-        return;
@@ -3030 +3030 @@
-        return;
-
-
+post_
-
-    // WP_POST_REVISIONS = true (default), -1
@@ -3050 +3050 @@
-        if ( false !== strpos( $revisions[$i]->post_name, 'autosave' ) )
-            continue;
-
+post_
-    }
-
@@ -3057 +3057 @@
-
-/**
-
+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
- */
-
+post_
-    global $wpdb;
-    if ( !$post = get_post( $post_id ) )
@@ -3083 +3083 @@
-    $autosave_query = new WP_Query;
-
-
+post_
-    $autosave = $autosave_query->query( $q );
-
+post_
-
-    if ( $autosave && is_array($autosave) && is_object($autosave[0]) )
@@ -3094 +3094 @@
-
-// Internally used to hack WP_Query into submission
-
+post_
-    $query->is_single = false;
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *
- * @package WordPress
@@ -3111 +3146 @@
- * @return mixed null or 0 if error, new revision ID if success
- */
-
+post_
-    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_
-
-    $revision_id = wp_insert_post( $post );
@@ -3129 +3164 @@
-
-    if ( $revision_id )
-
+post_
-    return $revision_id;
-}
-
-/**
-
+post_
- *
- * @package WordPress
@@ -3147 +3182 @@
- * @return mixed null if error or post object if success
- */
-
+post_
-    $null = null;
-    if ( !$revision = get_post( $post, OBJECT, $filter ) )
@@ -3168 +3203 @@
-
-/**
-
+post_
- *
- * Can restore a past using all fields of the post revision, or only selected fields.
@@ -3176 +3211 @@
- * @since 2.6
- *
-
+post_
- * @uses wp_update_post()
- *
@@ -3183 +3218 @@
- * @return mixed null if error, false if no fields to restore, (int) post ID if success
- */
-
-
+post_
+post_
-        return $revision;
-
-    if ( !is_array( $fields ) )
-
+post_
-
-    $update = array();
@@ -3204 +3239 @@
-
-    if ( $post_id )
-
+post_
-
-    return $post_id;
@@ -3210 +3245 @@
-
-/**
-
+post_
- *
- * Deletes the row from the posts table corresponding to the specified revision
@@ -3218 +3253 @@
- * @since 2.6
- *
-
+post_
- * @uses wp_delete_post()
- *
@@ -3225 +3260 @@
- * @return mixed null if error, false if no fields to restore, (int) post ID if success
- */
-
-
+post_
+post_
-        return $revision;
-
@@ -3234 +3269 @@
-
-    if ( $delete )
-
+post_
-
-    return $delete;