Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php (revision 23386)
+++ wp-includes/post-template.php (working copy)
@@ -1371,7 +1371,7 @@
}
/* translators: post revision: 1: when, 2: author name */
- $titlef = _x( '%1$s by %2$s', 'post revision' );
+ $titlef = _x( '%1$s: %2$s', 'post revision' );
if ( $parent )
array_unshift( $revisions, $post );
@@ -1387,6 +1387,7 @@
$date = wp_post_revision_title( $revision );
$name = get_the_author_meta( 'display_name', $revision->post_author );
+
if ( 'form-table' == $format ) {
if ( $left )
@@ -1402,16 +1403,17 @@
else
$actions = '';
+ $avatar = get_avatar( $revision->post_author, 24 );
$rows .= "
\n";
$rows .= "\t | \n";
$rows .= "\t | \n";
- $rows .= "\t$date | \n";
- $rows .= "\t$name | \n";
+ $rows .= "\t$avatar $name: $date | \n";
$rows .= "\t$actions | \n";
$rows .= "
\n";
} else {
- $title = sprintf( $titlef, $date, $name );
- $rows .= "\t$title\n";
+ $avatar = get_avatar( $revision->post_author, 18 );
+ $title = sprintf( $titlef, $name, $date );
+ $rows .= "\t$avatar $title\n";
}
}
@@ -1432,15 +1434,13 @@
-
-
-
+
+
|
|
- |
- |
+ |
|
Index: wp-includes/wp-diff.php
===================================================================
--- wp-includes/wp-diff.php (revision 23386)
+++ wp-includes/wp-diff.php (working copy)
@@ -98,7 +98,7 @@
* @return string
*/
function addedLine( $line ) {
- return "+ | {$line} | ";
+ return "{$line} | " . __("Added") . " | ";
}
/**
@@ -108,7 +108,7 @@
* @return string
*/
function deletedLine( $line ) {
- return "- | {$line} | ";
+ return "{$line} | " . __( "Deleted" ) . " | ";
}
/**
@@ -118,7 +118,7 @@
* @return string
*/
function contextLine( $line ) {
- return " | {$line} | ";
+ return "{$line} | ";
}
/**
@@ -127,7 +127,7 @@
* @return string
*/
function emptyLine() {
- return ' | ';
+ return ' | ';
}
/**
@@ -143,7 +143,7 @@
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '' . $this->emptyLine() . $this->addedLine( $line ) . "
\n";
+ $r .= '' . $this->addedLine( $line ) . "
\n";
}
return $r;
}
@@ -161,7 +161,7 @@
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '' . $this->deletedLine( $line ) . $this->emptyLine() . "
\n";
+ $r .= '' . $this->deletedLine( $line ) . "
\n";
}
return $r;
}
@@ -180,7 +180,7 @@
if ( $encode )
$line = htmlspecialchars( $line );
$r .= '' .
- $this->contextLine( $line ) . $this->contextLine( $line ) . "
\n";
+ $this->contextLine( $line ) . $this->emptyLine() . "\n";
}
return $r;
}
@@ -264,7 +264,7 @@
} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
$r .= $this->_deleted( array($orig_line), false );
} else { // A true changed row.
- $r .= '' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "
\n";
+ $r .= '' . $this->deletedLine( $orig_line ) . '
' . $this->addedLine( $final_line ) . "
\n";
}
}
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php (revision 23386)
+++ wp-includes/pluggable.php (working copy)
@@ -1722,16 +1722,16 @@
return '';
$r = "\n";
- $r .= "";
+ $r .= "";
if ( $args['title'] || $args['title_left'] || $args['title_right'] )
$r .= "";
if ( $args['title'] )
- $r .= "$args[title] |
\n";
+ $r .= "$args[title] |
\n";
if ( $args['title_left'] || $args['title_right'] ) {
$r .= "\n";
- $r .= "\t | $args[title_left] | \n";
- $r .= "\t | $args[title_right] | \n";
+ $r .= "\t$args[title_left] | \n";
+ $r .= "\t$args[title_right] | \n";
$r .= "
\n";
}
if ( $args['title'] || $args['title_left'] || $args['title_right'] )
Index: wp-admin/revision.php
===================================================================
--- wp-admin/revision.php (revision 23386)
+++ wp-admin/revision.php (working copy)
@@ -153,14 +153,13 @@
-