WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PHP Notice in Revisions comparison. Props filosofo. Fixes #13853 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-06-14 01:34:18 +00:00
parent 96a8731980
commit 0122124ee0
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/wp-diff.php
View File

@ -247,12 +247,19 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
continue; continue;
// If we have a word based diff, use it. Otherwise, use the normal line. // If we have a word based diff, use it. Otherwise, use the normal line.
$orig_line = isset($orig_diffs[$orig_rows[$row]]) if ( isset( $orig_diffs[$orig_rows[$row]] ) )
? $orig_diffs[$orig_rows[$row]] $orig_line = $orig_diffs[$orig_rows[$row]];
: htmlspecialchars($orig[$orig_rows[$row]]); elseif ( isset( $orig[$orig_rows[$row]] ) )
$final_line = isset($final_diffs[$final_rows[$row]]) $orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
? $final_diffs[$final_rows[$row]] else
: htmlspecialchars($final[$final_rows[$row]]); $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. if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
$r .= $this->_added( array($final_line), false ); $r .= $this->_added( array($final_line), false );