X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/baca9ce86a38dc54c4574890ee2d352fd81f78b2..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-includes/wp-diff.php?ds=sidebyside
diff --git a/wp-includes/wp-diff.php b/wp-includes/wp-diff.php
index 65dd0074..62f4162f 100644
--- a/wp-includes/wp-diff.php
+++ b/wp-includes/wp-diff.php
@@ -59,6 +59,15 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
*/
var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline';
+ /**
+ * Should we show the split view or not
+ *
+ * @var string
+ * @access protected
+ * @since 3.6.0
+ */
+ var $_show_split_view = true;
+
/**
* Constructor - Call parent constructor with params array.
*
@@ -70,6 +79,8 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
*/
function __construct( $params = array() ) {
parent::__construct( $params );
+ if ( isset( $params[ 'show_split_view' ] ) )
+ $this->_show_split_view = $params[ 'show_split_view' ];
}
/**
@@ -98,7 +109,8 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
* @return string
*/
function addedLine( $line ) {
- return "
+ | {$line} | ";
+ return "{$line} | ";
+
}
/**
@@ -108,7 +120,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
* @return string
*/
function deletedLine( $line ) {
- return "- | {$line} | ";
+ return "{$line} | ";
}
/**
@@ -118,7 +130,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
* @return string
*/
function contextLine( $line ) {
- return " | {$line} | ";
+ return "{$line} | ";
}
/**
@@ -127,7 +139,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
* @return string
*/
function emptyLine() {
- return ' | ';
+ return ' | ';
}
/**
@@ -143,7 +155,11 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '' . $this->emptyLine() . $this->addedLine( $line ) . "
\n";
+ if ( $this->_show_split_view ) {
+ $r .= '' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "
\n";
+ } else {
+ $r .= '' . $this->addedLine( $line ) . "
\n";
+ }
}
return $r;
}
@@ -161,7 +177,12 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '' . $this->deletedLine( $line ) . $this->emptyLine() . "
\n";
+ if ( $this->_show_split_view ) {
+ $r .= '' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "
\n";
+ } else {
+ $r .= '' . $this->deletedLine( $line ) . "
\n";
+ }
+
}
return $r;
}
@@ -179,8 +200,11 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '' .
- $this->contextLine( $line ) . $this->contextLine( $line ) . "
\n";
+ if ( $this->_show_split_view ) {
+ $r .= '' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "
\n";
+ } else {
+ $r .= '' . $this->contextLine( $line ) . "
\n";
+ }
}
return $r;
}
@@ -264,7 +288,11 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
} 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";
+ if ( $this->_show_split_view ) {
+ $r .= '' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "
\n";
+ } else {
+ $r .= '' . $this->deletedLine( $orig_line ) . "
" . $this->addedLine( $final_line ) . "
\n";
+ }
}
}