Changeset 23769 for trunk/wp-admin/revision.php
- Timestamp:
- 03/21/2013 03:54:11 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/revision.php
r23639 r23769 18 18 if ( ! $revision = wp_get_post_revision( $revision_id ) ) 19 19 break; 20 20 21 if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) 21 22 break; 23 24 22 25 if ( ! $post = get_post( $revision->post_parent ) ) 23 26 break; 24 27 25 // Revisions disabled and we're not looking at an autosave26 if ( ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) ) && ! wp_is_post_autosave( $revision )) {28 // Revisions disabled (previously checked autosavegs && ! wp_is_post_autosave( $revision )) 29 if ( ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) ) ) { 27 30 $redirect = 'edit.php?post_type=' . $post->post_type; 28 31 break; 29 32 } 30 check_admin_referer( "restore-post_{$post->ID}|{$revision->ID}" );31 33 32 //store revision event in post meta 33 $restore_details = array( 34 'restored_revision_id' => $revision->ID, 35 'restored_by_user' => get_current_user_id(), 36 'restored_time' => time() 37 ); 38 update_post_meta( $post->ID, '_post_restored_from', $restore_details ); 34 check_admin_referer( "restore-post_{$revision->ID}" ); 39 35 40 36 wp_restore_post_revision( $revision->ID ); … … 59 55 60 56 $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>'; 61 $revision_title = wp_post_revision_title( $revision, false );62 57 $h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); 63 58 $title = __( 'Revisions' ); … … 81 76 else 82 77 $parent_file = $submenu_file = 'edit.php'; 83 84 78 wp_enqueue_script( 'revisions' ); 85 79 … … 88 82 //TODO - Some of the translations below split things into multiple strings that are contextually related and this makes it pretty impossible for RTL translation. 89 83 //TODO can we pass the context in a better way 90 ?> 91 <script type="text/javascript"> 92 var wpRevisionsSettings = <?php echo json_encode( array( 'post_id' => $post->ID, 'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ) ) ); ?>;93 </script> 94 <?php 95 84 $wpRevisionsSettings = array( 'post_id' => $post->ID, 85 'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ), 86 'revision_id' => $revision_id ); 87 wp_localize_script( 'revisions', 'wpRevisionsSettings', $wpRevisionsSettings ); 88 89 $comparetworevisionslink = get_edit_post_link( $revision->ID ); 96 90 ?> 97 91 98 <div id="backbonerevisionsoptions"></div> 92 <div id="backbonerevisionsoptions"> 93 </div> 99 94 <div class="wrap"> 100 <div class="icon32 icon32-posts-post" id="icon-edit"><br></div> 95 <div class="icon32 icon32-posts-post" id="icon-edit"> 96 <br> 97 </div> 101 98 <div class="revisiondiffcontainer diffsplit currentversion rightmodelloading"> 102 <div id="modelsloading" class="updated message"><span class="spinner" ></span> <?php _e( 'Calculating revision diffs' ); ?></div> 99 <div id="modelsloading" class="updated message"> 100 <span class="spinner" ></span> <?php _e( 'Calculating revision diffs' ); ?> 101 </div> 103 102 <h2 class="long-header"><?php echo $h2; ?></h2> 104 <div id="backbonerevisionsinteract"></div> 105 <div id="backbonerevisionsdiff"></div> 103 <div class="diff-slider-ticks-wrapper"> 104 <div id="diff-slider-ticks"> 105 </div> 106 </div> 107 <div id="backbonerevisionsinteract"> 108 </div> 109 <div id="backbonerevisionsdiff"> 110 </div> 106 111 <hr /> 107 112 </div> … … 109 114 110 115 <script id="tmpl-revision" type="text/html"> 116 <div id="diffsubheader" class="diff-left-hand-meta-row"> 117 <div id="diff_from_current_revision"> 118 <?php printf( '<b>%1$s</b> %2$s.' , __( 'From:' ), __( 'the current version' ) ); ?> 119 </div> 120 <div id="difftitlefrom"> 121 <div class="diff-from-title"><?php _e( 'From:' ); ?></div>{{{ data.revision_from_date_author }}} 122 </div> 123 </div> 124 111 125 <div id="diffsubheader"> 112 <span id="diff_from_current_revision"><?php _e( 'Current version' ); ?><?php _e( '- compared to -' ); ?></span> 113 <div id="difftitlefrom">{{{ data.revision_from_date_author }}} <?php _e( '- compared to -' ); ?></div> 114 <div id="difftitle">{{{ data.revision_date_author }}}</div> 115 <div id="diffcancel"><input class="button" onClick="document.location='<?php echo get_edit_post_link( $post->ID ); ?>'" type="submit" id="cancel" value="<?php esc_attr_e( 'Cancel' )?>" /></div> 116 <div id="diffrestore"><input class="button button-primary" onClick="document.location='{{{ data.restoreaction }}}'" type="submit" id="restore" value="<?php esc_attr_e( 'Restore revision ID' )?>" /></div> 117 <div id="comparetworevisions"><input type="checkbox" id="comparetwo" value="comparetwo" {{{ data.comparetwochecked }}} name="comparetwo"/> <label for="comparetwo"><?php esc_attr_e( 'Compare two revisions' ); ?></a></div> </div> 126 <div id="difftitle"> 127 <div class="diff-to-title"><?php _e( 'To:' ); ?></div>{{{ data.revision_date_author }}} 128 </div> 129 <div id="diffrestore"> 130 <input class="button button-primary restore-button" onClick="document.location='{{{ data.restoreaction }}}'" type="submit" id="restore" value="<?php esc_attr_e( 'Restore This Revision' )?>" /> 131 </div> 132 <div id="comparetworevisions"> 133 <input type="checkbox" id="comparetwo" value="comparetwo" {{{ data.comparetwochecked }}} name="comparetwo"/> 134 <label for="comparetwo"><?php esc_attr_e( 'Compare two revisions' ); ?></a></label> 135 </div> 136 </div> 137 118 138 <div id="removedandadded"> 119 139 <div id="removed"><?php _e( 'Removed -' ); ?></div> … … 125 145 <script id="tmpl-revisionvinteract" type="text/html"> 126 146 <div id="diffheader"> 127 <div id="diffprevious"><input class="button" type="submit" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" /></div> 128 <div id="diffnext"><input class="button" type="submit" id="next" value="<?php esc_attr_e( 'Next' ); ?>" /></div> 129 <div id="diffslider"> 130 <div id="revisioncount"> 131 <?php _e( 'Comparing' ); ?> 132 <span id="diff_left_count"> <?php _e( 'revision' ); ?></span> <span id="diff_left_count_inner"></span> 133 <span id="diff_left_current_revision"><?php _e( 'current version' ); ?></span> 134 <span id="diff_revision_from">{{{ data.diff_revision_from }}}</span> 135 <?php _e( ' to revision' ); ?> 136 <span id="diff_count">{{{ data.current_diff }}}</span> 137 <?php _e( ' of ' ); ?> 138 <span id="diff_max" ></span> 139 </div> 140 141 <div id="slider" class="wp-slider"></div> 147 <div id="diffprevious"><input class="button" type="submit" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" /> 142 148 </div> 149 <div id="diffnext"><input class="button" type="submit" id="next" value="<?php esc_attr_e( 'Next' ); ?>" /> 150 </div> 151 <div id="diffslider"> 152 <div id="slider" class="wp-slider"> 153 </div> 154 </div> 155 </div> 156 </script> 157 <script id="tmpl-revision-ticks" type="text/html"> 158 <div class="revision-tick revision-toload{{{ data.revision_toload }}} revision-scopeofchanges-{{{ data.scope_of_changes }}}"> 143 159 </div> 144 160 </script>
Note: See TracChangeset
for help on using the changeset viewer.