From 02424796304a4b489bac76bd229b57091e814935 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Mon, 14 Jun 2010 01:34:18 +0000 Subject: [PATCH] Fix PHP Notice in Revisions comparison. Props filosofo. Fixes #13853 git-svn-id: https://develop.svn.wordpress.org/trunk@15246 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/wp-diff.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/wp-includes/wp-diff.php b/wp-includes/wp-diff.php index 3843223c61..3932fc331e 100644 --- a/wp-includes/wp-diff.php +++ b/wp-includes/wp-diff.php @@ -247,12 +247,19 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { continue; // If we have a word based diff, use it. Otherwise, use the normal line. - $orig_line = isset($orig_diffs[$orig_rows[$row]]) - ? $orig_diffs[$orig_rows[$row]] - : htmlspecialchars($orig[$orig_rows[$row]]); - $final_line = isset($final_diffs[$final_rows[$row]]) - ? $final_diffs[$final_rows[$row]] - : htmlspecialchars($final[$final_rows[$row]]); + if ( isset( $orig_diffs[$orig_rows[$row]] ) ) + $orig_line = $orig_diffs[$orig_rows[$row]]; + elseif ( isset( $orig[$orig_rows[$row]] ) ) + $orig_line = htmlspecialchars($orig[$orig_rows[$row]]); + else + $orig_line = ''; + + if ( isset( $final_diffs[$final_rows[$row]] ) ) + $final_line = $final_diffs[$final_rows[$row]]; + elseif ( isset( $final[$final_rows[$row]] ) ) + $final_line = htmlspecialchars($final[$final_rows[$row]]); + else + $final_line = ''; if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row. $r .= $this->_added( array($final_line), false );