Ticket #25473: 25473.4.diff

src/wp-admin/includes/revision.php

@@ -86 +86 @@
 
                 $args = array(
                         'show_split_view' => true,
+                        'title_left'      => __( 'Removed' ),
+                        'title_right'     => __( 'Added' ),
                 );
 
                 /**

src/wp-includes/class-wp-text-diff-renderer-table.php

@@ -176 +176 @@
                         }
 
                         if ( $this->_show_split_view ) {
-                                $r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+                                $r .= '<tr>' . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
                         } else {
                                 $r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
                         }
@@ -201 +201 @@
                                 $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'deleted' );
                         }
                         if ( $this->_show_split_view ) {
-                                $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+                                $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . "</tr>\n";
                         } else {
                                 $r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
                         }
@@ -226 +226 @@
                                 $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
                         }
                         if ( $this->_show_split_view ) {
-                                $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "</tr>\n";
+                                $r .= '<tr>' . $this->contextLine( $line ) . $this->contextLine( $line ) . "</tr>\n";
                         } else {
                                 $r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
                         }
@@ -319 +319 @@
                                 $r .= $this->_deleted( array( $orig_line ), false );
                         } else { // A true changed row.
                                 if ( $this->_show_split_view ) {
-                                        $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+                                        $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n";
                                 } else {
                                         $r .= '<tr>' . $this->deletedLine( $orig_line ) . '</tr><tr>' . $this->addedLine( $final_line ) . "</tr>\n";
                                 }

src/wp-includes/pluggable.php

@@ -2838 +2838 @@
                         return '';
                 }
 
-                $r = "<table class='diff'>\n";
+                $is_split_view       = ! empty( $args['show_split_view'] );
+                $is_split_view_class = $is_split_view ? ' is-split-view' : '';
 
-                if ( ! empty( $args['show_split_view'] ) ) {
-                        $r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
-                } else {
-                        $r .= "<col class='content' />";
+                $r = "<table class='diff$is_split_view_class'>\n";
+
+                if ( $args['title'] ) {
+                        $r .= "<caption class='diff-title'>$args[title]</caption>\n";
                 }
 
-                if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+                if ( $args['title_left'] || $args['title_right'] ) {
                         $r .= '<thead>';
                 }
-                if ( $args['title'] ) {
-                        $r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
-                }
+
                 if ( $args['title_left'] || $args['title_right'] ) {
+                        $th_or_td_left  = empty( $args['title_left'] ) ? 'td' : 'th';
+                        $th_or_td_right = empty( $args['title_right'] ) ? 'td' : 'th';
+
                         $r .= "<tr class='diff-sub-title'>\n";
-                        $r .= "\t<td></td><th>$args[title_left]</th>\n";
-                        $r .= "\t<td></td><th>$args[title_right]</th>\n";
+                        $r .= "\t<$th_or_td_left>$args[title_left]</$th_or_td_left>\n";
+                        if ( $is_split_view ) {
+                                $r .= "\t<$th_or_td_right>$args[title_right]</$th_or_td_right>\n";
+                        }
                         $r .= "</tr>\n";
                 }
-                if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+
+                if ( $args['title_left'] || $args['title_right'] ) {
                         $r .= "</thead>\n";
                 }