Wordpress 3.2-scripts

[autoinstalls/wordpress.git] / wp-includes / wp-diff.php

diff --git a/wp-includes/wp-diff.php b/wp-includes/wp-diff.php
index 3843223c61d04be3390f817f46a0500af2c97164..ed36ee908ba403a1dba9c89ceac628e6a0ae25e4 100644 (file)
--- a/wp-includes/wp-diff.php
+++ b/wp-includes/wp-diff.php
@@ -60,17 +60,16 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
        var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline';
 
        /**
-        * PHP4 Constructor - Call parent constructor with params array.
+        * Constructor - Call parent constructor with params array.
         *
         * This will set class properties based on the key value pairs in the array.
         *
-        * @since unknown
+        * @since 2.6.0
         *
         * @param array $params
         */
-       function Text_Diff_Renderer_Table( $params = array() ) {
-               $parent = get_parent_class($this);
-               $this->$parent( $params );
+       function __construct( $params = array() ) {
+               parent::__construct( $params );
        }
 
        /**
@@ -247,12 +246,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 );