Changeset 7913

Timestamp:

05/09/08 15:59:17 (4 months ago)

Author:

ryan

Message:

Revisioning for pages from mdawaffe. see #6775

Files:

• trunk/wp-admin/edit-page-form.php (modified) (5 diffs)
• trunk/wp-admin/revision.php (modified) (6 diffs)
• trunk/wp-includes/js/autosave.js (modified) (1 diff)
• trunk/wp-includes/post-template.php (modified) (2 diffs)
• trunk/wp-includes/post.php (modified) (3 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (1 diff)

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

@@ -6 +6 @@
-$messages[3] = __('Custom field deleted.');
-$messages[4] = __('Page updated.');
-
-
-
-
+
+
+
-
-if (!isset($post_ID) || 0 == $post_ID) {
@@ -21 +20 @@
-    $nonce_action = 'update-page_' . $post_ID;
-    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+    $autosave = wp_get_autosave( $post_id );
+    if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) )
+        $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
-}
-
@@ -31 +33 @@
-    $sendto = 'redo';
-?>
+
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
-
-<form name="post" action="page.php" method="post" id="post">
@@ -45 +54 @@
-<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
-<?php echo $form_extra ?>
-<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
@@ -283 +293 @@
-<?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', 'page'); ?>">
+<h3><?php _e('Page Revisions'); ?></h3>
+<div class="inside">
+<?php wp_list_post_revisions(); ?>
+</div>
+</div>
+<?php endif; ?>
+
+
-<?php do_meta_boxes('page', 'advanced', $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'));
@@ -9 +14 @@
-$right       = absint($right);
-
-
-$parent_file = $redirect = 'edit.php';
-$submenu_file = 'edit.php';
-$title = __( 'Post Revision' );
-
-
-switch ( $action ) :
@@ -39 +40 @@
-        break;
-
-edit_post', $left_revision->ID ) || !current_user_can( 'edit
+read_post', $left_revision->ID ) || !current_user_can( 'read
-        break;
-
@@ -81 +82 @@
-        break;
-
-edit_post', $revision->ID ) || !current_user_can( 'edit
+read_post', $revision->ID ) || !current_user_can( 'read
-        break;
-
@@ -96 +97 @@
-endswitch;
-
+if ( !$redirect && !in_array( $post->post_type, array( 'post', 'page' ) ) )
+    $redirect = 'edit.php';
+
-if ( $redirect ) {
-    wp_redirect( $redirect );
-    exit;
+}
+
+if ( 'page' == $post->post_type ) {
+    $submenu_file = 'edit-pages.php';
+    $title = __( 'Page Revisions' );
+} else {
+    $submenu_file = 'edit.php';
+    $title = __( 'Post Revisions' );
-}
-
@@ -164 +176 @@
-<br class="clear" />
-
-_e( 'Post Revisions' )
+echo $title
-
-<?php

trunk/wp-includes/js/autosave.js

@@ -181 +181 @@
-    if ( jQuery("#ping_status").attr("checked") )
-        post_data["ping_status"] = 'open';
-
+.size()
-        post_data["excerpt"] = jQuery("#excerpt").val();
-
+.size()
-        post_data["post_author"] = jQuery("#post_author").val();
-

trunk/wp-includes/post-template.php

@@ -642 +642 @@
-    $rows = '';
-    $class = false;
+    $can_edit_post = current_user_can( 'edit_post', $post->ID );
-    foreach ( $revisions as $revision ) {
+        if ( !current_user_can( 'read_post', $revision->ID ) )
+            continue;
+
-        $date = wp_post_revision_title( $revision );
-        $name = get_author_name( $revision->post_author );
@@ -655 +659 @@
-            $class = $class ? '' : " class='alternate'";
-
-current_user_can( 'edit_post', $post->ID )
+$can_edit_post
-                $actions = '<a href="' . wp_nonce_url( add_query_arg( array( 'revision' => $revision->ID, 'diff' => false, 'action' => 'restore' ) ), "restore-post_$post->ID|$revision->ID" ) . '">' . __( 'Restore' ) . '</a>';
-            else

trunk/wp-includes/post.php

@@ -957 +957 @@
-        $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'page' ) );
-    }
+
+    // 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.
+    foreach ( $revision_ids as $revision_id )
+        wp_delete_revision( $revision_id );
-
-    // Point all attachments to this post up one level
@@ -3023 +3029 @@
-        return;
-
+    if ( !constant('WP_POST_REVISIONS') )
+        return;
+
-    if ( !$post = get_post( $post_id, ARRAY_A ) )
-        return;
@@ -3228 +3237 @@
- */
-function wp_get_post_revisions( $post_id = 0 ) {
+    if ( !constant('WP_POST_REVISIONS') )
+        return array();
-    if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
-        return array();

trunk/wp-includes/script-loader.php

@@ -48 +48 @@
-        ) );
-
-7
+8
-
-        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax.js', array('prototype'), '20070306');

trunk/wp-settings.php

@@ -377 +377 @@
-do_action('plugins_loaded');
-
+$default_constants = array( 'WP_POST_REVISIONS' => true );
+foreach ( $default_constants as $c => $v )
+    @define( $c, $v ); // will fail if the constant is already defined
+unset($default_constants, $c, $v);
+
-// If already slashed, strip.
-if ( get_magic_quotes_gpc() ) {