X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/revision.php diff --git a/wp-admin/revision.php b/wp-admin/revision.php index 668ec484..0f48ef9a 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -1,223 +1,135 @@ post_parent ) ) - break; - if ( !$post = get_post( $revision->post_parent ) ) + if ( ! $revision = wp_get_post_revision( $revision_id ) ) break; - // Revisions disabled and we're not looking at an autosave - if ( ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) && !wp_is_post_autosave( $revision ) ) { - $redirect = 'edit.php?post_type=' . $post->post_type; + if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) break; - } - - check_admin_referer( "restore-post_$post->ID|$revision->ID" ); - wp_restore_post_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 ) ) + if ( ! $post = get_post( $revision->post_parent ) ) break; - if ( !current_user_can( 'read_post', $left_revision->ID ) || !current_user_can( 'read_post', $right_revision->ID ) ) - break; - - // If we're comparing a revision to itself, redirect to the 'view' page for that revision or the edit page for that post - if ( $left_revision->ID == $right_revision->ID ) { - $redirect = get_edit_post_link( $left_revision->ID ); - include( './js/revisions-js.php' ); + // Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision )) + if ( ! wp_revisions_enabled( $post ) ) { + $redirect = 'edit.php?post_type=' . $post->post_type; break; } - // Don't allow reverse diffs? - if ( strtotime($right_revision->post_modified_gmt) < strtotime($left_revision->post_modified_gmt) ) { - $redirect = add_query_arg( array( 'left' => $right, 'right' => $left ) ); + // Don't allow revision restore when post is locked + if ( wp_check_post_lock( $post->ID ) ) break; - } - if ( $left_revision->ID == $right_revision->post_parent ) // right is a revision of left - $post =& $left_revision; - elseif ( $left_revision->post_parent == $right_revision->ID ) // left is a revision of right - $post =& $right_revision; - elseif ( $left_revision->post_parent == $right_revision->post_parent ) // both are revisions of common parent - $post = get_post( $left_revision->post_parent ); - else - break; // Don't diff two unrelated revisions - - if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, '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 ) - ) { - $redirect = 'edit.php?post_type=' . $post->post_type; - break; - } - } + check_admin_referer( "restore-post_{$revision->ID}" ); - if ( - // They're the same - $left_revision->ID == $right_revision->ID - || - // Neither is a revision - ( !wp_get_post_revision( $left_revision->ID ) && !wp_get_post_revision( $right_revision->ID ) ) - ) - break; - - $post_title = '' . get_the_title() . ''; - $h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); - $title = __( 'Revisions' ); - - $left = $left_revision->ID; - $right = $right_revision->ID; - - $redirect = false; + wp_restore_post_revision( $revision->ID ); + $redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) ); break; case 'view' : +case 'edit' : default : - if ( !$revision = wp_get_post_revision( $revision_id ) ) + if ( ! $revision = wp_get_post_revision( $revision_id ) ) break; - if ( !$post = get_post( $revision->post_parent ) ) + if ( ! $post = get_post( $revision->post_parent ) ) break; - if ( !current_user_can( 'read_post', $revision->ID ) || !current_user_can( 'read_post', $post->ID ) ) + if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) ) break; // Revisions disabled and we're not looking at an autosave - if ( ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) && !wp_is_post_autosave( $revision ) ) { + if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { $redirect = 'edit.php?post_type=' . $post->post_type; break; } - $post_title = '' . get_the_title() . ''; - $revision_title = wp_post_revision_title( $revision, false ); - $h2 = sprintf( __( 'Revision for “%1$s” created on %2$s' ), $post_title, $revision_title ); - $title = __( 'Revisions' ); - - // Sets up the diff radio buttons - $left = $revision->ID; - $right = $post->ID; + $post_edit_link = get_edit_post_link(); + $post_title = '' . _draft_or_post_title() . ''; + $h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); + $return_to_post = '' . __( '← Return to post editor' ) . ''; + $title = __( 'Revisions' ); $redirect = false; break; -endswitch; +} // Empty post_type means either malformed object found, or no valid parent was found. -if ( !$redirect && empty($post->post_type) ) +if ( ! $redirect && empty( $post->post_type ) ) $redirect = 'edit.php'; -if ( !empty($redirect) ) { +if ( ! empty( $redirect ) ) { wp_redirect( $redirect ); exit; } // This is so that the correct "Edit" menu item is selected. -if ( !empty($post->post_type) && 'post' != $post->post_type ) +if ( ! empty( $post->post_type ) && 'post' != $post->post_type ) $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type; else $parent_file = $submenu_file = 'edit.php'; -require_once( './admin-header.php' ); - -?> - -
- -

- - - - - - - - - $field_title ) : - if ( 'diff' == $action ) { - $left_content = apply_filters( "_wp_post_revision_field_$field", $left_revision->$field, $field ); - $right_content = apply_filters( "_wp_post_revision_field_$field", $right_revision->$field, $field ); - if ( !$content = wp_text_diff( $left_content, $right_content ) ) - continue; // There is no difference between left and right - $identical = false; - } else { - add_filter( "_wp_post_revision_field_$field", 'htmlspecialchars' ); - $content = apply_filters( "_wp_post_revision_field_$field", $revision->$field, $field ); - } - ?> +wp_enqueue_script( 'revisions' ); +wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) ); - - - - +/* Revisions Help Tab */ - ' . __( 'This screen is used for managing your content revisions.' ) . '

'; +$revisions_overview .= '

' . __( 'Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.' ) . '

'; +$revisions_overview .= '

' . __( 'From this screen you can review, compare, and restore revisions:' ) . '

'; +$revisions_overview .= ''; -endforeach; +get_current_screen()->add_help_tab( array( + 'id' => 'revisions-overview', + 'title' => __( 'Overview' ), + 'content' => $revisions_overview +) ); -if ( 'diff' == $action && $identical ) : +$revisions_sidebar = '

' . __( 'For more information:' ) . '

'; +$revisions_sidebar .= '

' . __( 'Revisions Management' ) . '

'; +$revisions_sidebar .= '

' . __( 'Support Forums' ) . '

'; - ?> +get_current_screen()->set_help_sidebar( $revisions_sidebar ); - - - - -
- - -

- -
- -

- - 'form-table', 'parent' => true, 'right' => $right, 'left' => $left ); -if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) - $args['type'] = 'autosave'; - -wp_list_post_revisions( $post, $args ); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> +
+

+
-