From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- includes/diff/WikiDiff3.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'includes/diff/WikiDiff3.php') diff --git a/includes/diff/WikiDiff3.php b/includes/diff/WikiDiff3.php index 66727445..ea6f6e5d 100644 --- a/includes/diff/WikiDiff3.php +++ b/includes/diff/WikiDiff3.php @@ -29,7 +29,7 @@ * (http://citeseer.ist.psu.edu/myers86ond.html) with range compression (see Wu et al.'s * "An O(NP) Sequence Comparison Algorithm"). * - * This implementation supports an upper bound on the excution time. + * This implementation supports an upper bound on the execution time. * * Complexity: O((M + N)D) worst case time, O(M + N + D^2) expected time, O(M + N) space * @@ -64,7 +64,7 @@ class WikiDiff3 { public function diff( /*array*/ $from, /*array*/ $to ) { // remember initial lengths - $m = sizeof( $from ); + $m = count( $from ); $n = count( $to ); $this->heuristicUsed = false; @@ -490,7 +490,6 @@ class WikiDiff3 { $temp = array( 0, 0, 0 ); - $max_progress = array_fill( 0, ceil( max( $forward_end_diag - $forward_start_diag, $backward_end_diag - $backward_start_diag ) / 2 ), $temp ); $num_progress = 0; // the 1st entry is current, it is initialized -- cgit v1.2.3-54-g00ecf