Ticket #18733: revision-number.patch

wp-admin/revision.php

@@ -116 +116 @@
                 $redirect = 'edit.php?post_type=' . $post->post_type;
                 break;
         }
-
+    
+    $revision_num = wp_post_revision_num( $revision, false );
+    
         $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
         $revision_title = wp_post_revision_title( $revision, false );
-        $h2 = sprintf( __( 'Revision for &#8220;%1$s&#8221; created on %2$s' ), $post_title, $revision_title );
+        $h2 = sprintf( __( 'Revision %1$s for &#8220;%2$s&#8221; created on %3$s' ), $revision_num, $post_title, $revision_title );
         $title = __( 'Revisions' );
 
         // Sets up the diff radio buttons
@@ -155 +157 @@
 
 <table class="form-table ie-fixed">
         <col class="th" />
-<?php if ( 'diff' == $action ) : ?>
+<?php 
+
+if ( 'diff' == $action ) : 
+    $left_revision_num = wp_post_revision_num( $left_revision, true );
+    $right_revision_num = wp_post_revision_num( $right_revision, true );
+
+?>
 <tr id="revision">
         <th scope="row"></th>
         <th scope="col" class="th-full">
-                <span class="alignleft"><?php printf( __('Older: %s'), wp_post_revision_title( $left_revision ) ); ?></span>
-                <span class="alignright"><?php printf( __('Newer: %s'), wp_post_revision_title( $right_revision ) ); ?></span>
+                <span class="alignleft"><?php printf( __('Older: %s'), wp_post_revision_title( $left_revision ) ); ?>&nbsp;<?php echo $left_revision_num; ?></span>
+                <span class="alignright"><?php printf( __('Newer: %s'), wp_post_revision_title( $right_revision ) ); ?>&nbsp;<?php echo $right_revision_num; ?></span>
         </th>
 </tr>
 <?php endif;

wp-includes/post-template.php

@@ -1299 +1299 @@
 }
 
 /**
+ * Retrieve revision id of a revision (linked to that revisions's page).
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.3
+ *
+ * @uses date_i18n()
+ *
+ * @param int|object $revision Revision ID or revision object.
+ * @param bool $link Optional, default is true. Link to revisions's page?
+ * @return string revision number or link to revision page.
+ */
+ 
+function wp_post_revision_num($revision, $link = true) {
+    if ( !$revision = get_post( $revision ) )
+                return $revision;
+
+        if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+                return false;
+    
+    if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+                $revision_num = "<a href='$link'>#$revision->ID</a>";
+    else 
+        $revision_num = "#$revision->ID";
+    
+    return $revision_num;
+}
+
+/**
  * Display list of a post's revisions.
  *
  * Can output either a UL with edit links or a TABLE with diff interface, and
@@ -1363 +1392 @@
                         continue;
                 if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
                         continue;
-
+        
+        $revision_num = wp_post_revision_num( $revision );
                 $date = wp_post_revision_title( $revision );
                 $name = get_the_author_meta( 'display_name', $revision->post_author );
 
@@ -1384 +1414 @@
                         $rows .= "<tr$class>\n";
                         $rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='left' value='$revision->ID'$left_checked /></th>\n";
                         $rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='right' value='$revision->ID'$right_checked /></th>\n";
-                        $rows .= "\t<td>$date</td>\n";
+            $rows .= "\t<td>$revision_num</td>\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 {
                         $title = sprintf( $titlef, $date, $name );
-                        $rows .= "\t<li>$title</li>\n";
+                        $rows .= "\t<li>$title $revision_num</li>\n";
                 }
         }
 
@@ -1409 +1440 @@
 <br class="clear" />
 
 <table class="widefat post-revisions" cellspacing="0" id="post-revisions">
+    <col />
         <col />
         <col />
         <col style="width: 33%" />
@@ -1418 +1450 @@
 <tr>
         <th scope="col"><?php /* translators: column name in revisons */ _ex( 'Old', 'revisions column name' ); ?></th>
         <th scope="col"><?php /* translators: column name in revisons */ _ex( 'New', 'revisions column name' ); ?></th>
+    <th scope="col"><?php /* translators: column name in revisons */ _ex( 'Revision', 'revisions column name' ); ?></th>
         <th scope="col"><?php /* translators: column name in revisons */ _ex( 'Date Created', 'revisions column name' ); ?></th>
         <th scope="col"><?php _e( 'Author' ); ?></th>
         <th scope="col" class="action-links"><?php _e( 'Actions' ); ?></th>