diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/revision.php --- a/wp/wp-admin/revision.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/revision.php Mon Oct 14 18:28:13 2019 +0200 @@ -7,12 +7,6 @@ * @package WordPress * @subpackage Administration * @since 2.6.0 - * - * @param int revision Optional. The revision ID. - * @param string action The action to take. - * Accepts 'restore', 'view' or 'edit'. - * @param int from The revision to compare from. - * @param int to Optional, required if revision missing. The revision to compare to. */ /** WordPress Administration Bootstrap */ @@ -20,72 +14,94 @@ require ABSPATH . 'wp-admin/includes/revision.php'; +/** + * @global int $revision Optional. The revision ID. + * @global string $action The action to take. + * Accepts 'restore', 'view' or 'edit'. + * @global int $from The revision to compare from. + * @global int $to Optional, required if revision missing. The revision to compare to. + */ wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) ); $revision_id = absint( $revision ); $from = is_numeric( $from ) ? absint( $from ) : null; -if ( ! $revision_id ) +if ( ! $revision_id ) { $revision_id = absint( $to ); +} $redirect = 'edit.php'; switch ( $action ) { -case 'restore' : - if ( ! $revision = wp_get_post_revision( $revision_id ) ) - break; + case 'restore': + if ( ! $revision = wp_get_post_revision( $revision_id ) ) { + break; + } - if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) - break; + if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) { + break; + } - if ( ! $post = get_post( $revision->post_parent ) ) - break; + if ( ! $post = get_post( $revision->post_parent ) ) { + break; + } - // Restore if revisions are enabled or this is an autosave. - if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { - $redirect = 'edit.php?post_type=' . $post->post_type; - break; - } + // Restore if revisions are enabled or this is an autosave. + if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { + $redirect = 'edit.php?post_type=' . $post->post_type; + break; + } - // Don't allow revision restore when post is locked - if ( wp_check_post_lock( $post->ID ) ) - break; + // Don't allow revision restore when post is locked + if ( wp_check_post_lock( $post->ID ) ) { + break; + } - check_admin_referer( "restore-post_{$revision->ID}" ); + check_admin_referer( "restore-post_{$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 'view' : -case 'edit' : -default : - if ( ! $revision = wp_get_post_revision( $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; - if ( ! $post = get_post( $revision->post_parent ) ) - break; - - if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) ) - break; + case 'view': + case 'edit': + default: + if ( ! $revision = wp_get_post_revision( $revision_id ) ) { + break; + } + if ( ! $post = get_post( $revision->post_parent ) ) { + break; + } - // Revisions disabled and we're not looking at an autosave - if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { - $redirect = 'edit.php?post_type=' . $post->post_type; - break; - } + if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) ) { + break; + } + + // Revisions disabled and we're not looking at an autosave + if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { + $redirect = 'edit.php?post_type=' . $post->post_type; + break; + } - $post_edit_link = get_edit_post_link(); - $post_title = '' . _draft_or_post_title() . ''; - /* translators: 1: Post title */ - $h1 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); - $return_to_post = '' . __( '← Return to editor' ) . ''; - $title = __( 'Revisions' ); + $post_edit_link = get_edit_post_link(); + $post_title = '' . _draft_or_post_title() . ''; + /* translators: %s: post title */ + $h1 = sprintf( __( 'Compare Revisions of “%s”' ), $post_title ); + $return_to_post = '' . __( '← Return to editor' ) . ''; + $title = __( 'Revisions' ); - $redirect = false; - break; + $redirect = false; + break; } // 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 ) ) { wp_redirect( $redirect ); @@ -93,10 +109,11 @@ } // 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 +} else { $parent_file = $submenu_file = 'edit.php'; +} wp_enqueue_script( 'revisions' ); wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) ); @@ -110,15 +127,17 @@ $revisions_overview .= '
  • ' . __( 'Compare two different revisions by selecting the “Compare any two revisions” box to the side.' ) . '
    • '; $revisions_overview .= '
  • ' . __( 'To restore a revision, click Restore This Revision.' ) . '
    • '; -get_current_screen()->add_help_tab( array( - 'id' => 'revisions-overview', - 'title' => __( 'Overview' ), - 'content' => $revisions_overview -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'revisions-overview', + 'title' => __( 'Overview' ), + 'content' => $revisions_overview, + ) +); $revisions_sidebar = '

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

    '; $revisions_sidebar .= '

    ' . __( 'Revisions Management' ) . '

    '; -$revisions_sidebar .= '

    ' . __( 'Support Forums' ) . '

    '; +$revisions_sidebar .= '

    ' . __( 'Support' ) . '

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