site_iri: comparison web/wp-includes/wp-diff.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 	 * @since 2.6.0
 	 */
 	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() ) {
+	function __construct( $params = array() ) {
-		$parent = get_parent_class($this);
+		parent::__construct( $params );
-		$this->$parent( $params );
 	}
 	/**
 	 * @ignore
 	 *
 	 */
 	function _changed( $orig, $final ) {
 		$r = '';
 		// Does the aforementioned additional processing
-		// *_matches tell what rows are "the same" in orig and final.  Those pairs will be diffed to get word changes
+		// *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes
 		//	match is numeric: an index in other column
-		//	match is 'X': no match.  It is a new row
+		//	match is 'X': no match. It is a new row
 		// *_rows are column vectors for the orig column and the final column.
 		//	row >= 0: an indix of the $orig or $final array
 		//	row  < 0: a blank row for that column
 		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
 		// These will hold the word changes as determined by an inline diff
 		$orig_diffs  = array();
 		$final_diffs = array();
 					// since we count lengith of text between <ins> or <del> (instead of picking just one),
 					//	we double the length of chars not in those tags.
 					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
 					if ( $diff_ratio > $this->_diff_threshold )
-						continue; // Too different.  Don't save diffs.
+						continue; // Too different. Don't save diffs.
 				}
 				// Un-inline the diffs by removing del or ins
 				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
 				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
 			}
 		}
 		foreach ( array_keys($orig_rows) as $row ) {
-			// Both columns have blanks.  Ignore them.
+			// Both columns have blanks. Ignore them.
 			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
 				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 ( $orig_rows[$row] < 0 ) { // Orig is blank.  This is really an added row.
+			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 );
-			} elseif ( $final_rows[$row] < 0 ) { // Final is blank.  This is really a deleted row.
+			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
 				$r .= $this->_deleted( array($orig_line), false );
 			} else { // A true changed row.
 				$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n";
 			}
 		}
 	 * @param unknown_type $final
 	 * @return unknown
 	 */
 	function interleave_changed_lines( $orig, $final ) {
-		// Contains all pairwise string comparisons.  Keys are such that this need only be a one dimensional array.
+		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
 		foreach ( array_keys($orig) as $o ) {
 			foreach ( array_keys($final) as $f ) {
 				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
 			}
 			// Already have better matches for these guys
 			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
 				continue;
-			// First match for these guys.  Must be best match
+			// First match for these guys. Must be best match
 			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
 				$orig_matches[$o] = $f;
 				$final_matches[$f] = $o;
 				continue;
 			}
 		// We read the text in this order
 		ksort($orig_matches);
 		ksort($final_matches);
 		// Stores rows and blanks for each column.
 		$orig_rows = $orig_rows_copy = array_keys($orig_matches);
 		$final_rows = array_keys($final_matches);
 		// Interleaves rows with blanks to keep matches aligned.
 			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
 			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
 			if ( false === $final_pos ) { // This orig is paired with a blank final.
 				array_splice( $final_rows, $orig_pos, 0, -1 );
-			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways.  Pad final with blank rows.
+			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
 				while ( $diff_pos < 0 )
 					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
-			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways.  Pad orig with blank rows.
+			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
 				while ( $diff_pos < 0 )
 					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
 			}
 		}
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
 		if ( $diff_count < 0 ) {
 			while ( $diff_count < 0 )
 		$chars2 = count_chars($string2);
 		// L1-norm of difference vector.
 		$difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
-		// $string1 has zero length? Odd.  Give huge penalty by not dividing.
+		// $string1 has zero length? Odd. Give huge penalty by not dividing.
 		if ( !$string1 )
 			return $difference;
 		// Return distance per charcter (of string1)
 		return $difference / strlen($string1);
 		$words  = str_replace( "\n", $newlineEscape, $words );
 		return $words;
 	}
 }
-?>

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b