Changeset 15246

Timestamp:

06/14/2010 01:34:18 AM (14 years ago)

Author:

dd32

Message:

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

File:

• trunk/wp-includes/wp-diff.php (modified) (1 diff)

trunk/wp-includes/wp-diff.php

@@ -248 +248 @@
 
             // 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.