Changeset 7747

Timestamp:

04/18/2008 11:38:21 PM (16 years ago)

Author:

ryan

Message:

Post revisions from mdawaffe. see #6775

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/css/colors-classic.css (modified) (2 diffs)
• wp-admin/css/colors-fresh.css (modified) (2 diffs)
• wp-admin/css/ie.css (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/revision.php (added)
• wp-admin/wp-admin.css (modified) (2 diffs)
• wp-includes/Text (added)
• wp-includes/Text/Diff (added)
• wp-includes/Text/Diff.php (added)
• wp-includes/Text/Diff/Engine (added)
• wp-includes/Text/Diff/Engine/native.php (added)
• wp-includes/Text/Diff/Engine/shell.php (added)
• wp-includes/Text/Diff/Engine/string.php (added)
• wp-includes/Text/Diff/Engine/xdiff.php (added)
• wp-includes/Text/Diff/Renderer (added)
• wp-includes/Text/Diff/Renderer.php (added)
• wp-includes/Text/Diff/Renderer/inline.php (added)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (3 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/wp-diff.php (added)

trunk/wp-admin/admin-ajax.php

@@ -461 +461 @@
     break;
 case 'autosave' : // The name of this action is hardcoded in edit_post()
+    define( 'DOING_AUTOSAVE', true );
+
     $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce');
     global $current_user;

trunk/wp-admin/css/colors-classic.css

@@ -3 +3 @@
 }
 
-body    {
+body, .form-table pre {
     background-color: #fff;
     color: #333;
@@ -714 +714 @@
     color: #333;
 }
+
+/* Diff */
+
+table.diff .diff-deletedline {
+    background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+    background-color: #ff9999;
+}
+table.diff .diff-addedline {
+    background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+    background-color: #99ff99;
+}

trunk/wp-admin/css/colors-fresh.css

@@ -3 +3 @@
 }
 
-body    {
+body, .form-table pre {
     background-color: #fff;
     color: #333;
@@ -685 +685 @@
     color: #333;
 }
+
+/* Diff */
+
+table.diff .diff-deletedline {
+    background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+    background-color: #ff9999;
+}
+table.diff .diff-addedline {
+    background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+    background-color: #99ff99;
+}

trunk/wp-admin/css/ie.css

@@ -112 +112 @@
     display: block;
     margin-top: -3px;
+}
 
+table.ie-fixed {
+    table-layout: fixed;
 }
 

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

@@ -7 +7 @@
 $messages[3] = __('Custom field deleted.');
 $messages[4] = __('Post updated.');
+$messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_time( $_GET['revision'] ) );
 ?>
 <?php if (isset($_GET['message'])) : ?>
@@ -337 +338 @@
 <?php endif; ?>
 
+<?php if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : ?>
+<div id="revisionsdiv" class="postbox <?php echo postbox_classes('revisionsdiv', 'post'); ?>">
+<h3><?php _e('Post Revisions'); ?></h3>
+<div class="inside">
+<?php wp_list_post_revisions(); ?>
+</div>
+</div>
+<?php endif; ?>
+
 <?php do_meta_boxes('post', 'advanced', $post); ?>
 

trunk/wp-admin/page.php

@@ -71 +71 @@
     if ( empty($post->ID) ) wp_die( __("You attempted to edit a page that doesn't exist. Perhaps it was deleted?") );
 
-    if ( 'post' == $post->post_type ) {
-        wp_redirect("post.php?action=edit&post=$post_ID");
+    if ( 'page' != $post->post_type ) {
+        wp_redirect( get_edit_post_link( $post_ID, 'url' ) );
         exit();
     }

trunk/wp-admin/post.php

@@ -78 +78 @@
     if ( empty($post->ID) ) wp_die( __("You attempted to edit a post that doesn't exist. Perhaps it was deleted?") );
 
-    if ( 'page' == $post->post_type ) {
-        wp_redirect("page.php?action=edit&post=$post_ID");
+    if ( 'post' != $post->post_type ) {
+        wp_redirect( get_edit_post_link( $post->ID, 'url' ) );
         exit();
     }

trunk/wp-admin/wp-admin.css

@@ -893 +893 @@
 #profile-page .form-table #rich_editing {
     margin-right: 5px
+}
+
+.form-table pre {
+    padding: 8px;
+    margin: 0;
+    /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
+    white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+    white-space: -pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+
+table.form-table td .updated {
+    font-size: 13px;
 }
 
@@ -1465 +1480 @@
     display: none;
 }
+
+/* Diff */
+
+table.diff {
+    width: 100%;
+}
+
+table.diff col.content {
+    width: 50%;
+}
+
+table.diff tr {
+    background-color: transparent;
+}
+
+table.diff td, table.diff th {
+    padding: .5em;
+    font-family: monospace;
+    border: none;
+}
+
+table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+    text-decoration: none;
+}

trunk/wp-includes/default-filters.php

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

trunk/wp-includes/link-template.php

@@ -443 +443 @@
 }
 
-function get_edit_post_link( $id = 0 ) {
+function get_edit_post_link( $id = 0, $context = 'display' ) {
     if ( !$post = &get_post( $id ) )
         return;
+
+    if ( 'display' == $context )
+        $action = 'action=edit&';
+    else
+        $action = 'action=edit&';
 
     switch ( $post->post_type ) :
@@ -460 +465 @@
         $var  = 'attachment_id';
         break;
+    case 'revision' :
+        if ( !current_user_can( 'edit_post', $post->ID ) )
+            return;
+        $file = 'revision';
+        $var  = 'revision';
+        $action = '';
+        break;
     default :
         if ( !current_user_can( 'edit_post', $post->ID ) )
@@ -468 +480 @@
     endswitch;
     
-    return apply_filters( 'get_edit_post_link', get_bloginfo( 'wpurl' ) . "/wp-admin/$file.php?action=edit&$var=$post->ID", $post->ID );
+    return apply_filters( 'get_edit_post_link', get_bloginfo( 'wpurl' ) . "/wp-admin/$file.php?{$action}$var=$post->ID", $post->ID );
 }
 

trunk/wp-includes/pluggable.php

@@ -1351 +1351 @@
 endif;
 
+if ( !function_exists( 'wp_text_diff' ) ) :
+/**
+ * wp_text_diff() - compares two strings and outputs a human readable HTML representation of their difference
+ *
+ * Basically a wrapper for man diff(1)
+ *
+ * Must accept an optional third parameter, $args @see wp_parse_args()
+ *    (string) title: optional.  If present, titles the diff in a manner compatible with the output
+ *
+ * Must return the empty string if the two compared strings are found to be equivalent according to whatever metric
+ *
+ * @since 2.6
+ * @uses Text_Diff
+ * @uses WP_Text_Diff_Renderer_Table
+ *
+ * @param string $left_string "old" (left) version of string
+ * @param string $right_string "new" (right) version of string
+ * @param string|array $args @see wp_parse_args()
+ * @return string human readable HTML of string differences.  Empty string if strings are equivalent
+ */
+function wp_text_diff( $left_string, $right_string, $args = null ) {
+    $defaults = array( 'title' => '' );
+    $args = wp_parse_args( $args, $defaults );
+
+    // PEAR Text_Diff is lame; it includes things from include_path rather than it's own path.
+    // Not sure of the ramifications of disttributing modified code.
+    ini_set('include_path', '.' . PATH_SEPARATOR . ABSPATH . WPINC );
+
+    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
+        require( ABSPATH . WPINC . '/wp-diff.php' );
+
+    // Normalize whitespace
+    $left_string  = trim($left_string);
+    $right_string = trim($right_string);
+    $left_string  = str_replace("\r", "\n", $left_string);
+    $right_string = str_replace("\r", "\n", $right_string);
+    $left_string  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $left_string );
+    $right_string = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $right_string );
+    
+    $left_lines  = split("\n", $left_string);
+    $right_lines = split("\n", $right_string);
+
+    $text_diff = new Text_Diff($left_lines, $right_lines);
+    $renderer  = new WP_Text_Diff_Renderer_Table();
+    $diff = $renderer->render($text_diff);
+
+    ini_restore('include_path');
+
+    if ( !$diff )
+        return '';
+
+    $r  = "<table class='diff'>\n";
+    $r .= "<col class='ltype' /><col class='content' /><col class='ltype' /><col class='content' />";
+
+    if ( $args['title'] )
+        $r .= "<thead><tr><th colspan='4'>$args[title]</th></tr></thead>\n";
+
+    $r .= "<tbody>\n$diff\n</tbody>\n";
+    $r .= "</table>";
+
+    return $r;
+}
+endif;
+
 ?>

trunk/wp-includes/post-template.php

@@ -565 +565 @@
 }
 
-?>
+/**
+ * wp_post_revision_time() - returns formatted datetimestamp of a revision
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses wp_get_revision()
+ * @uses date_i18n()
+ *
+ * @param int|object $revision revision ID or revision object
+ * @return string i18n formatted datetimestamp or localized 'Corrent Revision'
+ */
+function wp_post_revision_time( $revision ) {
+    if ( !$revision = wp_get_revision( $revision ) ) {
+        if ( $revision = get_post( $revision ) )
+            return __( 'Current Revision' );
+        return $revision;
+    }
+
+    $datef  = _c( 'j F, Y @ G:i|revision date format');
+    return date_i18n( $datef, strtotime( $revision->post_date_gmt . ' +0000' ) );
+}
+
+/**
+ * wp_list_post_revisions() - echoes list of a post's revisions
+ *
+ * Can output either a UL with edit links or a TABLE with diff interface, and restore action links
+ *
+ * Second argument controls parameters:
+ *   (bool)   parent : include the parent (the "Current Revision") in the list
+ *   (string) format : 'list' or 'form-table'.  'list' outputs UL, 'form-table' outputs TABLE with UI
+ *   (int)    right  : what revision is currently being viewed - used in form-table format
+ *   (int)    left   : what revision is currently being diffed against right - used in form-table format
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses wp_get_post_revisions()
+ * @uses wp_post_revision_time()
+ * @uses get_edit_post_link()
+ * @uses get_author_name()
+ *
+ * @param int|object $post_id post ID or post object
+ * @param string|array $args see description @see wp_parse_args()
+ */
+function wp_list_post_revisions( $post_id = 0, $args = null ) { // TODO? split into two functions (list, form-table) ?
+    if ( !$post = get_post( $post_id ) )
+        return;
+
+    if ( !$revisions = wp_get_post_revisions( $post->ID ) )
+        return;
+
+    $defaults = array( 'parent' => false, 'right' => false, 'left' => false, 'format' => 'list' );
+    extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
+
+    $titlef = _c( '%1$s by %2$s|post revision 1:datetime, 2:name' );
+
+    if ( $parent )
+        array_unshift( $revisions, $post );
+
+    $rows = '';
+    $class = false;
+    foreach ( $revisions as $revision ) {
+        $date = wp_post_revision_time( $revision );
+        if ( $link = get_edit_post_link( $revision->ID ) )
+            $date = "<a href='$link'>$date</a>";
+        $name = get_author_name( $revision->post_author );
+
+        if ( 'form-table' == $format ) {
+            if ( $left )
+                $old_checked = $left == $revision->ID ? ' checked="checked"' : '';
+            else
+                $old_checked = $new_checked ? ' checked="checked"' : '';
+            $new_checked = $right == $revision->ID ? ' checked="checked"' : '';
+
+            $class = $class ? '' : " class='alternate'";
+
+            if ( $post->ID != $revision->ID && current_user_can( 'edit_post', $post->ID ) )
+                $actions = '<a href="' . wp_nonce_url( add_query_arg( array( 'revision' => $revision->ID, 'diff' => false, 'restore' => 'restore' ) ), "restore-post_$post->ID|$revision->ID" ) . '">' . __( 'Restore' ) . '</a>';
+            else
+                $actions = '';
+
+            $rows .= "<tr$class>\n";
+            $rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='diff' value='$revision->ID'$old_checked /><input type='radio' name='revision' value='$revision->ID'$new_checked />\n";
+            $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 {
+            $rows .= "\t<li>" . sprintf( $titlef, $date, $name ). "</li>\n";
+        }
+    }
+
+    if ( 'form-table' == $format ) : ?>
+
+<form action="revision.php" method="get">
+
+<div class="tablenav">
+    <div class="alignleft">
+        <input type="submit" class="button-secondary" value="<?php _e( 'Compare Revisions' ); ?>" />
+    </div>
+</div>
+
+<br class="clear" />
+
+<table class="widefat post-revisions">
+    <col />
+    <col style="width: 33%" />
+    <col style="width: 33%" />
+    <col style="width: 33%" />
+<thead>
+    <th scope="col"></th>
+    <th scope="col"><?php _e( 'Date Created' ); ?></th>
+    <th scope="col"><?php _e( 'Author' ); ?></th>
+    <th scope="col" class="action-links"><?php _e( 'Actions' ); ?></th>
+</thead>
+<tbody>
+
+<?php echo $rows; ?>
+
+</tbody>
+</table>
+
+<?php
+    else :
+        echo "<ul class='post-revisions'>\n";
+        echo $rows;
+        echo "</ul>";
+    endif;
+
+}

trunk/wp-includes/post.php

@@ -2991 +2991 @@
 }
 
+/* Post Revisions */
+
+/**
+ * _wp_revision_fields() - determines which fields of posts are to be saved in revisions
+ *
+ * Does two things. If passed a postn *array*, it will return a post array ready to be
+ * insterted into the posts table as a post revision.
+ * Otherwise, returns an array whose keys are the post fields to be saved post revisions.
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @param array $post optional a post array to be processed for insertion as a post revision
+ * @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 ) {
+    static $fields = false;
+
+    if ( !$fields ) {
+        // Allow these to be versioned
+        $fields = array(
+            'post_title' => __( 'Title' ),
+            'post_author' => __( 'Author' ),
+            'post_content' => __( 'Content' ),
+            'post_excerpt' => __( 'Excerpt' ),
+        );
+
+        // 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] );
+    }
+
+    if ( !is_array($post) )
+        return $fields;
+
+    $return = array();
+    foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field )
+        $return[$field] = $post[$field];
+
+    $return['post_parent']   = $post['ID'];
+    $return['post_status']   = 'inherit';
+    $return['post_type']     = 'revision';
+    $return['post_name']     = "$post[ID]-revision";
+    $return['post_date']     = $post['post_modified'];
+    $return['post_date_gmt'] = $post['post_modified_gmt'];
+
+    return $return;
+}
+
+/**
+ * wp_save_revision() - Saves an already existing post as a post revision.  Typically used immediately prior to post updates.
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses _wp_put_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 ) {
+    // TODO: rework autosave to use special type of post revision
+    if ( @constant( 'DOING_AUTOSAVE' ) )
+        return;
+
+    if ( !$post = get_post( $post_id, ARRAY_A ) )
+        return;
+
+    // TODO: open this up for pages also
+    if ( 'post' != $post->post_type )
+        retun;
+
+    return _wp_put_revision( $post );
+}
+
+/**
+ * _wp_put_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
+ * @return mixed null or 0 if error, new revision ID if success
+ */
+function _wp_put_revision( $post = null ) {
+    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' ) );
+
+    $post = _wp_revision_fields( $post );
+
+    if ( $revision_id = wp_insert_post( $post ) )
+        do_action( '_wp_put_revision', $revision_id );
+
+    return $revision_id;
+}
+
+/**
+ * wp_get_revision() - Gets a post revision
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses get_post()
+ *
+ * @param int|object $post post ID or post object
+ * @param $output optional OBJECT, ARRAY_A, or ARRAY_N
+ * @param string $filter optional sanitation filter.  @see sanitize_post()
+ * @return mixed null if error or post object if success
+ */
+function &wp_get_revision(&$post, $output = OBJECT, $filter = 'raw') {
+    $null = null;
+    if ( !$revision = get_post( $post, OBJECT, $filter ) )
+        return $revision;
+    if ( 'revision' !== $revision->post_type )
+        return $null;
+
+    if ( $output == OBJECT ) {
+        return $revision;
+    } elseif ( $output == ARRAY_A ) {
+        $_revision = get_object_vars($revision);
+        return $_revision;
+    } elseif ( $output == ARRAY_N ) {
+        $_revision = array_values(get_object_vars($revision));
+        return $_revision;
+    }
+
+    return $revision;
+}
+
+/**
+ * wp_restore_revision() - Restores a post to the specified revision
+ *
+ * Can restore a past using all fields of the post revision, or only selected fields.
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses wp_get_revision()
+ * @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
+ */
+function wp_restore_revision( $revision_id, $fields = null ) {
+    if ( !$revision = wp_get_revision( $revision_id, ARRAY_A ) )
+        return $revision;
+
+    if ( !is_array( $fields ) )
+        $fields = array_keys( _wp_revision_fields() );
+
+    $update = array();
+    foreach( array_intersect( array_keys( $revision ), $fields ) as $field )
+        $update[$field] = $revision[$field];
+
+    if ( !$update )
+        return false;
+
+    $update['ID'] = $revision['post_parent'];
+
+    if ( $post_id = wp_update_post( $update ) )
+        do_action( 'wp_restore_revision', $post_id, $revision['ID'] );
+
+    return $post_id;
+}
+
+/**
+ * wp_delete_revision() - Deletes a revision.
+ *
+ * Deletes the row from the posts table corresponding to the specified revision
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses wp_get_revision()
+ * @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
+ */
+function wp_delete_revision( $revision_id ) {
+    if ( !$revision = wp_get_revision( $revision_id ) )
+        return $revision;
+
+    if ( $delete = wp_delete_post( $revision->ID ) )
+        do_action( 'wp_delete_revision', $revision->ID, $revision );
+
+    return $delete;
+}
+
+/**
+ * wp_get_post_revisions() - Returns all revisions of specified post
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
+ * @uses get_children()
+ *
+ * @param int|object $post_id post ID or post object
+ * @return array empty if no revisions
+ */
+function wp_get_post_revisions( $post_id = 0 ) {
+    if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
+        return array();
+
+    if ( !$revisions = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'revision' ) ) )
+        return array();
+    return $revisions;
+}
+
 ?>