Ticket #6775: 6775.7.diff

wp-includes/default-filters.php

@@ -179 +179 @@
-add_action('init', 'smilies_init', 5);
-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);
-add_action('future_page', '_future_post_hook', 5, 2);

wp-includes/post-template.php

@@ -593 +593 @@
-        if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-                $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 );
-
-        return $date;
@@ -628 +628 @@
-        if ( !$post = get_post( $post_id ) )
-                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' );
-
-        if ( $parent )
@@ -645 +656 @@
-        foreach ( $revisions as $revision ) {
-                if ( !current_user_can( 'read_post', $revision->ID ) )
-                        continue;
+                if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
+                        continue;
-
-                $date = wp_post_revision_title( $revision );
-                $name = get_author_name( $revision->post_author );

wp-includes/post.php

@@ -956 +956 @@
-
-        // 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
-        $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
@@ -2951 +2951 @@
-/* Post Revisions */
-
-/**
-
+post_
- *
- * Does two things. If passed a post *array*, it will return a post array ready to be
- * insterted into the posts table as a post revision.
@@ -2965 +2965 @@
- * @param bool $autosave optional Is the revision an autosave?
- * @return array post array ready to be inserted as a post revision or array of fields that can be versioned
- */
-
+post_
-        static $fields = false;
-
-        if ( !$fields ) {
@@ -2978 +2978 @@
-                );
-
-                // Runs only once
-
+post_
-
-                // 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' ) as $protect )
@@ -3003 +3003 @@
-}
-
-/**
-
+post_
- *
- * @package WordPress
- * @subpackage Post Revisions
- * @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;
-
@@ -3029 +3029 @@
-        if ( !in_array( $post['post_type'], array( 'post', 'page' ) ) )
-                return;
-
-
+post_
-
-        // WP_POST_REVISIONS = true (default), -1
-        if ( !is_numeric( WP_POST_REVISIONS ) || WP_POST_REVISIONS < 0 )
@@ -3049 +3049 @@
-        for ( $i = 0; isset($revisions[$i]); $i++ ) {
-                if ( false !== strpos( $revisions[$i]->post_name, 'autosave' ) )
-                        continue;
-
+post_
-        }
-
-        return $return;
-}
-
-/**
-
+post_
- *
- * Returns a post object containing the information that was autosaved for the specified post.
- *
@@ -3067 +3067 @@
- * @param int $post_id The post ID
- * @return object|bool the autosaved data or false on failure or when no autosave exists
- */
-
+post_
-        global $wpdb;
-        if ( !$post = get_post( $post_id ) )
-                return false;
@@ -3082 +3082 @@
-        // Use WP_Query so that the result gets cached
-        $autosave_query = new WP_Query;
-
-
+post_
-        $autosave = $autosave_query->query( $q );
-
+post_
-
-        if ( $autosave && is_array($autosave) && is_object($autosave[0]) )
-                return $autosave[0];
@@ -3093 +3093 @@
-}
-
-// Internally used to hack WP_Query into submission
-
+post_
-        $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
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
- * @uses wp_insert_post()
- *
- * @param int|object|array $post post ID, post object OR post array
- * @param bool $autosave optional Is the revision an autosave?
- * @return mixed null or 0 if error, new revision ID if success
- */
-
+post_
-        if ( is_object($post) )
-                $post = get_object_vars( $post );
-        elseif ( !is_array($post) )
@@ -3121 +3156 @@
-        if ( isset($post['post_type']) && 'revision' == $post_post['type'] )
-                return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
-
-
+post_
-
-        $revision_id = wp_insert_post( $post );
-        if ( is_wp_error($revision_id) )
-                return $revision_id;
-
-        if ( $revision_id )
-
+post_
-        return $revision_id;
-}
-
-/**
-
+post_
- *
- * @package WordPress
- * @subpackage Post Revisions
@@ -3146 +3181 @@
- * @param string $filter optional sanitation filter.  @see sanitize_post()
- * @return mixed null if error or post object if success
- */
-
+post_
-        $null = null;
-        if ( !$revision = get_post( $post, OBJECT, $filter ) )
-                return $revision;
@@ -3167 +3202 @@
-}
-
-/**
-
+post_
- *
- * Can restore a past using all fields of the post revision, or only selected fields.
- *
@@ -3175 +3210 @@
- * @subpackage Post Revisions
- * @since 2.6
- *
-
+post_
- * @uses wp_update_post()
- *
- * @param int|object $revision_id revision ID or revision object
- * @param array $fields optional What fields to restore from.  Defaults to all.
- * @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();
-        foreach( array_intersect( array_keys( $revision ), $fields ) as $field )
@@ -3203 +3238 @@
-                return $post_id;
-
-        if ( $post_id )
-
+post_
-
-        return $post_id;
-}
-
-/**
-
+post_
- *
- * Deletes the row from the posts table corresponding to the specified revision
- *
@@ -3217 +3252 @@
- * @subpackage Post Revisions
- * @since 2.6
- *
-
+post_
- * @uses wp_delete_post()
- *
- * @param int|object $revision_id revision ID or revision object
- * @param array $fields optional What fields to restore from.  Defaults to all.
- * @return mixed null if error, false if no fields to restore, (int) post ID if success
- */
-
-
+post_
+post_
-                return $revision;
-
-        $delete = wp_delete_post( $revision->ID );
@@ -3233 +3268 @@
-                return $delete;
-
-        if ( $delete )
-
+post_
-
-        return $delete;
-}

wp-admin/admin-ajax.php

@@ -519 +519 @@
-                        if ( 'draft' == $post->post_status ) {
-                                $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;
-                                else

wp-admin/includes/post.php

@@ -649 +649 @@
-}
-
-/**
-
+post_
- *
- * @package WordPress
- * @subpackage Post Revisions
- * @since 2.6
- *
- * @uses _wp_translate_postdata()
-
+post_
- */
-
+post_
-        $translated = _wp_translate_postdata( true );
-        if ( is_wp_error( $translated ) )
-                return $translated;
-
-        // 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 );
-        }
-
-        // Otherwise create the new autosave as a special post revision
-
+post_
-}

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'));
-$revision_id = absint($revision);
-$diff        = absint($diff);
@@ -18 +13 @@
-switch ( $action ) :
-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;
-case 'diff' :
@@ -57 +58 @@
-        else
-                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
-                $left_revision->ID == $right_revision->ID
-        ||
-                // Neither is a revision
-revision( $left_revision->ID ) && !wp_ge
+post_revision( $left_revision->ID ) && !wp_get_pos
-        )
-                break;
-        
@@ -76 +88 @@
-        break;
-case 'view' :
-default :
-
+post_
-                break;
-        if ( !$post = get_post( $revision->post_parent ) )
-                break;
@@ -84 +96 @@
-        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;
+
-        $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
-        $revision_title = wp_post_revision_title( $revision, false );
-        $h2 = sprintf( __( 'Post Revision for &#8220;%1$s&#8221; created on %2$s' ), $post_title, $revision_title );
@@ -113 +128 @@
-}
-
-// Converts post_author ID# into name
-
+post_
-
-require_once( 'admin-header.php' );
-
@@ -137 +152 @@
-
-// 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_
-        }
-        ?>
-
@@ -179 +194 @@
-
-<?php
-
-
+
+
+
-
+wp_list_post_revisions( $post, $args );
+
-require_once( 'admin-footer.php' );

wp-admin/edit-page-form.php

@@ -19 +19 @@
-        $form_action = 'editpost';
-        $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 ) );
-}

wp-admin/edit-form-advanced.php

@@ -21 +21 @@
-        $post_ID = (int) $post_ID;
-        $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 ) );
-}