| 1 | Index: wp-includes/wp-diff.php |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- wp-includes/wp-diff.php (revision 15226) |
|---|
| 4 | +++ wp-includes/wp-diff.php (working copy) |
|---|
| 5 | @@ -247,13 +247,20 @@ |
|---|
| 6 | continue; |
|---|
| 7 | |
|---|
| 8 | // If we have a word based diff, use it. Otherwise, use the normal line. |
|---|
| 9 | - $orig_line = isset($orig_diffs[$orig_rows[$row]]) |
|---|
| 10 | - ? $orig_diffs[$orig_rows[$row]] |
|---|
| 11 | - : htmlspecialchars($orig[$orig_rows[$row]]); |
|---|
| 12 | - $final_line = isset($final_diffs[$final_rows[$row]]) |
|---|
| 13 | - ? $final_diffs[$final_rows[$row]] |
|---|
| 14 | - : htmlspecialchars($final[$final_rows[$row]]); |
|---|
| 15 | + if ( isset( $orig_diffs[$orig_rows[$row]] ) ) |
|---|
| 16 | + $orig_line = $orig_diffs[$orig_rows[$row]]; |
|---|
| 17 | + elseif ( isset( $orig[$orig_rows[$row]] ) ) |
|---|
| 18 | + $orig_line = htmlspecialchars($orig[$orig_rows[$row]]); |
|---|
| 19 | + else |
|---|
| 20 | + $orig_line = ''; |
|---|
| 21 | |
|---|
| 22 | + if ( isset( $final_diffs[$final_rows[$row]] ) ) |
|---|
| 23 | + $final_line = $final_diffs[$final_rows[$row]]; |
|---|
| 24 | + elseif ( isset( $final[$final_rows[$row]] ) ) |
|---|
| 25 | + $final_line = htmlspecialchars($final[$final_rows[$row]]); |
|---|
| 26 | + else |
|---|
| 27 | + $final_line = ''; |
|---|
| 28 | + |
|---|
| 29 | if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row. |
|---|
| 30 | $r .= $this->_added( array($final_line), false ); |
|---|
| 31 | } elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row. |
|---|
