Ticket #6775: 6775.2.diff

wp-includes/post-template.php

@@ -566 +566 @@
-}
-
-/**
-me() - returns formatted datetimestamp of a revision
+tle() - returns formatted datetimestamp of a revision (linked to that revisions's page)
- *
- * @package WordPress
- * @subpackage Post Revisions
- * @since 2.6
- *
- * @uses wp_get_revision()
- * @uses date_i18n()
- *
- * @param int|object $revision revision ID or revision object
+ * @param bool $link optional Link to revisions's page?
- * @return string i18n formatted datetimestamp or localized 'Corrent Revision'
- */
-
-
-
-
+
+
-                return $revision;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-/**
@@ -605 +617 @@
- * @since 2.6
- *
- * @uses wp_get_post_revisions()
-m
+tl
- * @uses get_edit_post_link()
- * @uses get_author_name()
- *
@@ -630 +642 @@
-        $rows = '';
-        $class = false;
-        foreach ( $revisions as $revision ) {
-
-
-
+
-                $name = get_author_name( $revision->post_author );
-
-                if ( 'form-table' == $format ) {
-                        if ( $left )
-old
+left
-                        else
-old_checked = $new_checked ? ' checked="checked"' : '';
-new
+left_checked = $right_checked ? ' checked="checked"' : ''; // [sic] (the next one)
+right
-
-                        $class = $class ? '' : " class='alternate'";
-
-                        if ( $post->ID != $revision->ID && current_user_can( 'edit_post', $post->ID ) )
-restore
+action
-                        else
-                                $actions = '';
-
-                        $rows .= "<tr$class>\n";
-diff' value='$revision->ID'$old_checked /><input type='radio' name='revision' value='$revision->ID'$new
+left' value='$revision->ID'$left_checked /><input type='radio' name='right' value='$revision->ID'$right
-                        $rows .= "\t<td>$date</td>\n";
-                        $rows .= "\t<td>$name</td>\n";
-                        $rows .= "\t<td class='action-links'>$actions</td>\n";
-                        $rows .= "</tr>\n";
-                } else {
-
+
+
-                }
-        }
-
@@ -667 +678 @@
-<div class="tablenav">
-        <div class="alignleft">
-                <input type="submit" class="button-secondary" value="<?php _e( 'Compare Revisions' ); ?>" />
+                <input type="hidden" name="action" value="diff" />
-        </div>
-</div>
-

wp-includes/post.php

@@ -88 +88 @@
-        $r = wp_parse_args( $args, $defaults );
-
-        $children = get_posts( $r );
-
-        if ( !$children )
-                return false;
-
@@ -2957 +2956 @@
-/**
- * _wp_revision_fields() - determines which fields of posts are to be saved in revisions
- *
-n
+
- * insterted into the posts table as a post revision.
-
+for 
- *
- * @package WordPress
- * @subpackage Post Revisions
- * @since 2.6
- *
- * @param array $post optional a post array to be processed for insertion as a post revision
+ * @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
- */
-
+, $autosave = false
-        static $fields = false;
-
-        if ( !$fields ) {
@@ -2980 +2980 @@
-                        'post_excerpt' => __( 'Excerpt' ),
-                );
-
+                // Runs only once
+                $fields = apply_filters( '_wp_revision_fields', $fields );
+
-                // 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 )
-                        unset( $fields[$protect] );
@@ -2995 +2998 @@
-        $return['post_parent']   = $post['ID'];
-        $return['post_status']   = 'inherit';
-        $return['post_type']     = 'revision';
-
+$autosave ? "$post[ID]-autosave" : 
-        $return['post_date']     = $post['post_modified'];
-        $return['post_date_gmt'] = $post['post_modified_gmt'];
-
@@ -3015 +3018 @@
- * @return mixed null or 0 if error, new revision ID if success
- */
-function wp_save_revision( $post_id ) {
-TODO: rework autosave to use special type of post revision
+We do autosaves manually with wp_create_autosave()
-        if ( @constant( 'DOING_AUTOSAVE' ) )
-                return;
-
-        if ( !$post = get_post( $post_id, ARRAY_A ) )
-                return;
-
-
-
+
-                return;
-
-        return _wp_put_revision( $post );
-}
-
-/**
+ * wp_get_autosave() - returns the autosaved data of the specified post.
+ *
+ * Returns a post object containing the information that was autosaved for the specified post.
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @param int $post_id The post ID
+ * @return object|bool the autosaved data or false on failure or when no autosave exists
+ */
+function wp_get_autosave( $post_id ) {
+        global $wpdb;
+        if ( !$post = get_post( $post_id ) )
+                return false;
+
+        $q = array(
+                'name' => "{$post->ID}-autosave",
+                'post_parent' => $post->ID,
+                'post_type' => 'revision',
+                'post_status' => 'inherit'
+        );
+
+        // Use WP_Query so that the result gets cached
+        $autosave_query = new WP_Query;
+
+        add_action( 'parse_query', '_wp_get_autosave_hack' );
+        $autosave = $autosave_query->query( $q );
+        remove_action( 'parse_query', '_wp_get_autosave_hack' );
+
+        if ( $autosave && is_array($autosave) && is_object($autosave[0]) )
+                return $autosave[0];
+
+        return false;
+}
+
+// Internally used to hack WP_Query into submission
+function _wp_get_autosave_hack( $query ) {
+        $query->is_single = false;
+}
+
+/**
- * _wp_put_revision() - Inserts post data into the posts table as a post revision
- *
- * @package WordPress
@@ -3039 +3083 @@
- * @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
- */
-
+, $autosave = false
-        if ( is_object($post) )
-                $post = get_object_vars( $post );
-        elseif ( !is_array($post) )
-                $post = get_post($post, ARRAY_A);
-
-        if ( !$post || empty($post['ID']) )
-                return;
-
-        if ( isset($post['post_type']) && 'revision' == $post_post['type'] )
-                return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
-
-
+, $autosave
-
-
+
+
+
+
+
-                do_action( '_wp_put_revision', $revision_id );
-
-        return $revision_id;
-}
-
@@ -3127 +3174 @@
-
-        $update['ID'] = $revision['post_parent'];
-
-
+
+
+
+
+
-                do_action( 'wp_restore_revision', $post_id, $revision['ID'] );
-
-        return $post_id;
@@ -3153 +3204 @@
-        if ( !$revision = wp_get_revision( $revision_id ) )
-                return $revision;
-
-
+
+
+
+
+
-                do_action( 'wp_delete_revision', $revision->ID, $revision );
-
-        return $delete;
@@ -3174 +3229 @@
-function wp_get_post_revisions( $post_id = 0 ) {
-        if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
-                return array();
-
-
+
-                return array();
-        return $revisions;
-}
-
-?>

wp-includes/js/autosave.js

@@ -168 +168 @@
-        autosave_disable_buttons();
-
-        var origStatus = jQuery('#original_post_status').val();
-        if ( 'draft' != origStatus ) // autosave currently only turned on for drafts
-                doAutoSave = false;
-
-        autosaveLast = jQuery("#title").val()+jQuery("#content").val();
-        goodcats = ([]);

wp-includes/pluggable.php

@@ -1392 +1392 @@
- * @return string human readable HTML of string differences.  Empty string if strings are equivalent
- */
-function wp_text_diff( $left_string, $right_string, $args = null ) {
-
+, 'title_left' => '', 'title_right' => ''
-        $args = wp_parse_args( $args, $defaults );
-
-        // PEAR Text_Diff is lame; it includes things from include_path rather than it's own path.
@@ -1425 +1425 @@
-        $r  = "<table class='diff'>\n";
-        $r .= "<col class='ltype' /><col class='content' /><col class='ltype' /><col class='content' />";
-
+        if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+                $r .= "<thead>";
-        if ( $args['title'] )
-
+
+
+
+
+
+
+
+
+
-
-        $r .= "<tbody>\n$diff\n</tbody>\n";
-        $r .= "</table>";

wp-includes/script-loader.php

@@ -47 +47 @@
-                        'broken' => __('An unidentified error has occurred.')
-                ) );
-
-424
+507
-
-                $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax.js', array('prototype'), '20070306');
-                $this->localize( 'wp-ajax', 'WPAjaxL10n', array(

wp-admin/admin-ajax.php

@@ -461 +461 @@
-case 'autosave' : // The name of this action is hardcoded in edit_post()
-        define( 'DOING_AUTOSAVE', true );
-
-
+ 
-        global $current_user;
-
-        $_POST['post_status'] = 'draft';
-        $_POST['post_category'] = explode(",", $_POST['catslist']);
-        $_POST['tags_input'] = explode(",", $_POST['tags_input']);
-        if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
@@ -478 +477 @@
-
-        $supplemental = array();
-
-
+$revision_id = 
-        if($_POST['post_ID'] < 0) {
+                $_POST['post_status'] = 'draft';
-                $_POST['temp_ID'] = $_POST['post_ID'];
-                if ( $do_autosave ) {
-                        $id = wp_write_post();
@@ -510 +510 @@
-                        if ( !current_user_can('edit_post', $post_ID) )
-                                die(__('You are not allowed to edit this post.'));
-                }
+
-                if ( $do_autosave ) {
-
+
+
+
+
+
+
+
+
+
+
-                        $data = $message;
-                } else {
-                        $id = $post->ID;

wp-admin/includes/post.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $_POST['post_content'] = $_POST['content'];
-        $_POST['post_excerpt'] = $_POST['excerpt'];
-        $_POST['post_parent'] = isset($_POST['parent_id'])? $_POST['parent_id'] : '';
@@ -32 +21 @@
-
-        if (!empty ( $_POST['post_author_override'] ) ) {
-                $_POST['post_author'] = (int) $_POST['post_author_override'];
-
+ {
-                if (!empty ( $_POST['post_author'] ) ) {
-                        $_POST['post_author'] = (int) $_POST['post_author'];
-                } else {
-                        $_POST['post_author'] = (int) $_POST['user_ID'];
-                }
+        }
-
-        if ( $_POST['post_author'] != $_POST['user_ID'] ) {
-                if ( 'page' == $_POST['post_type'] ) {
-
-
+
+
+
+
+
+
-                } else {
-
-
-
+
+
+
+
+
+
-                }
-        }
-
@@ -61 +58 @@
-                $_POST['post_status'] = 'draft';
-
-        if ( 'page' == $_POST['post_type'] ) {
-'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' )
+ 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) 
-                        $_POST['post_status'] = 'pending';
-        } else {
-'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' )
+ 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) 
-                        $_POST['post_status'] = 'pending';
-        }
-
@@ -74 +71 @@
-        if (!isset( $_POST['ping_status'] ))
-                $_POST['ping_status'] = 'closed';
-
- 
+
-                if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
-                        $_POST['edit_date'] = '1';
-                        break;
-                }
-        }
-
-!empty 
+ !empty
-                $aa = $_POST['aa'];
-                $mm = $_POST['mm'];
-                $jj = $_POST['jj'];
@@ -92 +89 @@
-                $hh = ($hh > 23 ) ? $hh -24 : $hh;
-                $mn = ($mn > 59 ) ? $mn -60 : $mn;
-                $ss = ($ss > 59 ) ? $ss -60 : $ss;
-"$aa-$mm-$jj $hh:$mn:$ss"
-"$aa-$mm-$jj $hh:$mn:$ss"
+sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss )
+$_POST['post_date']
-        }
-
+        return true;
+}
+
+
+// Update an existing post with values provided in $_POST.
+function edit_post() {
+
+        $post_ID = (int) $_POST['post_ID'];
+
+        if ( 'page' == $_POST['post_type'] ) {
+                if ( !current_user_can( 'edit_page', $post_ID ) )
+                        wp_die( __('You are not allowed to edit this page.' ));
+        } else {
+                if ( !current_user_can( 'edit_post', $post_ID ) )
+                        wp_die( __('You are not allowed to edit this post.' ));
+        }
+
+        // Autosave shouldn't save too soon after a real save
+        if ( 'autosave' == $_POST['action'] ) {
+                $post =& get_post( $post_ID );
+                $now = time();
+                $then = strtotime($post->post_date_gmt . ' +0000');
+                $delta = AUTOSAVE_INTERVAL / 2;
+                if ( ($now - $then) < $delta )
+                        return $post_ID;
+        }
+
+        $translated = _wp_translate_postdata( true );
+        if ( is_wp_error($translated) )
+                wp_die( $translated->get_error_message() );
+
-        // Meta Stuff
-        if ( isset($_POST['meta']) && $_POST['meta'] ) {
-                foreach ( $_POST['meta'] as $key => $value )
@@ -236 +264 @@
-                }
-        }
-
-
-
-
-
-
+
+
+
-
-        if (!empty ( $_POST['post_author_override'] ) ) {
-                $_POST['post_author'] = (int) $_POST['post_author_override'];
-        } else {
-                if (!empty ( $_POST['post_author'] ) ) {
-                        $_POST['post_author'] = (int) $_POST['post_author'];
-                } else {
-                        $_POST['post_author'] = (int) $_POST['user_ID'];
-                }
-
-        }
-
-        if ( $_POST['post_author'] != $_POST['user_ID'] ) {
-                if ( 'page' == $_POST['post_type'] ) {
-                        if ( !current_user_can( 'edit_others_pages' ) )
-                                return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-                } else {
-                        if ( !current_user_can( 'edit_others_posts' ) )
-                                return new WP_Error( 'edit_others_posts', __( 'You are not allowed to post as this user.' ) );
-
-                }
-        }
-
-        // What to do based on which button they pressed
-        if ( isset($_POST['saveasdraft']) && '' != $_POST['saveasdraft'] )
-                $_POST['post_status'] = 'draft';
-        if ( isset($_POST['saveasprivate']) && '' != $_POST['saveasprivate'] )
-                $_POST['post_status'] = 'private';
-        if ( isset($_POST['publish']) && ( '' != $_POST['publish'] ) && ( $_POST['post_status'] != 'private' ) )
-                $_POST['post_status'] = 'publish';
-        if ( isset($_POST['advanced']) && '' != $_POST['advanced'] )
-                $_POST['post_status'] = 'draft';
-
-        if ( 'page' == $_POST['post_type'] ) {
-                if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) )
-                        $_POST['post_status'] = 'pending';
-        } else {
-                if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) )
-                        $_POST['post_status'] = 'pending';
-        }
-
-        if (!isset( $_POST['comment_status'] ))
-                $_POST['comment_status'] = 'closed';
-
-        if (!isset( $_POST['ping_status'] ))
-                $_POST['ping_status'] = 'closed';
-
-        foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-                if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
-                        $_POST['edit_date'] = '1';
-                        break;
-                }
-        }
-
-        if (!empty ( $_POST['edit_date'] ) ) {
-                $aa = $_POST['aa'];
-                $mm = $_POST['mm'];
-                $jj = $_POST['jj'];
-                $hh = $_POST['hh'];
-                $mn = $_POST['mn'];
-                $ss = $_POST['ss'];
-                $jj = ($jj > 31 ) ? 31 : $jj;
-                $hh = ($hh > 23 ) ? $hh -24 : $hh;
-                $mn = ($mn > 59 ) ? $mn -60 : $mn;
-                $ss = ($ss > 59 ) ? $ss -60 : $ss;
-                $_POST['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-                $_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] );
-        }
-
-        // Create the post.
-        $post_ID = wp_insert_post( $_POST );
-        if ( is_wp_error( $post_ID ) )
@@ -687 +645 @@
-                update_post_meta( $post->ID, '_edit_last', $current_user->ID );
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

wp-admin/revision.php

@@ -2 +2 @@
-
-require_once('admin.php');
-
-
+
+
+
+
+
+
+
+
-$submenu_file = 'edit.php';
+$title = __( 'Post Revision' );
-
-wp_reset_vars(array('revision', 'diff', 'restore'));
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
+        wp_restore_revision( $revision->ID );
+        $redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
+        break;
+case 'diff' :
+        if ( !$left_revision  = get_post( $left ) )
+                break;
+        if ( !$right_revision = get_post( $right ) )
+                break;
+
+        if ( !current_user_can( 'edit_post', $left_revision->ID ) || !current_user_can( 'edit_post', $right_revision->ID ) )
+                break;
+
-        // Don't allow reverse diffs?
-
-wp_redirect( add_query_arg( array( 'diff' => $revision->ID, 'revision' => $diff )
-exit
+ght_re
+$redirect = add_query_arg( array( 'left' => $right, 'right' => $left
+break
-        }
-
-
-
-
+
+
+
+
+
+
+
+
-
-        if (
-                // They're the same
-
+ight_r
-        ||
-                // They don't have a comment parent (and we're not comparing a revision to it's post)
-                ( $left_revision->ID != $revision->post_parent && $left_revision->post_parent != $revision->ID && $left_revision->post_parent != $revision->post_parent )
-        ||
-                // Neither is a revision
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $right = $post->ID;
-        $left  = $revision->ID;
-}
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-        exit;
-}
-
+// Converts post_author ID# into name
-add_filter( '_wp_revision_field_post_author', 'get_author_name' );
-
-$title = __( 'Post Revision' );
-
-require_once( 'admin-header.php' );
-
-$post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
-$revision_time = wp_post_revision_time( $revision );
-?>
-
-<div class="wrap">
-
-style="padding-right: 0"><?php printf( $h2, $post_title, $revision_time )
+class="long-header"><?php echo $h2
-
-<table class="form-table ie-fixed">
-        <col class="th" />
-
-
+
-<tr id="revision">
-        <th scope="row"></th>
-
-
+
+
+
+
-</tr>
-
-<?php endif;
-
-
+filters
-$identical = true;
-foreach ( _wp_revision_fields() as $field => $field_title ) :
-
+
+
+
+
+
+
+
-                add_filter( "_wp_revision_field_$field", 'htmlspecialchars' );
-
-
-
-
-
+
-        }
-        $identical = false;
-        ?>
-
-?
+
-                <th scope="row"><?php echo wp_specialchars( $field_title ); ?></th>
- colspan="2"
+
-        </tr>
-
-        <?php
-
-endforeach;
-
-$diff
+'diff' == $action
-
-        ?>
-
-3"><div class="updated"><p><?php _e( 'These revisions are identical
+2"><div class="updated"><p><?php _e( 'These revisions are identical.
-
-        <?php
-
@@ -127 +166 @@
-<h2><?php _e( 'Post Revisions' ); ?></h2>
-
-<?php
-        wp_list_post_revisions( $post, array( 'format' => 'form-table', 'exclude' => $revision->ID, 'parent' => true, 'right' => $right, 'left' => $left ) );
-
-
+
+
+

wp-admin/edit-form-advanced.php

@@ -1 @@
-
-
+
+
+
-if ( isset($_GET['message']) )
-        $_GET['message'] = absint( $_GET['message'] );
-$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
-$messages[2] = __('Custom field updated.');
-$messages[3] = __('Custom field deleted.');
-$messages[4] = __('Post updated.');
-
+
+
+
+
+
+
+