From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Wed, 20 Nov 2013 19:57:15 +0000 (+0100)
Subject: Initialise variables and update documentation
X-Git-Tag: 1.31.0-rc.0~17987^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=84552a2dd40729a4334bb7879bb66eeeda954053;p=lhc%2Fweb%2Fwiklou.git

Initialise variables and update documentation

Change-Id: Idb242f65801ee79531c2300cf9fcb5b3929f66ab
---

diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index 37f1e59bff..2781597f61 100644
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -384,6 +384,8 @@ class DiffEngine {
 				if ( empty( $ymatches[$line] ) ) {
 					continue;
 				}
+
+				$k = 0;
 				$matches = $ymatches[$line];
 				reset( $matches );
 				while ( list( , $y ) = each( $matches ) ) {
@@ -394,6 +396,7 @@ class DiffEngine {
 						break;
 					}
 				}
+
 				while ( list( , $y ) = each( $matches ) ) {
 					if ( $y > $this->seq[$k - 1] ) {
 						assert( '$y < $this->seq[$k]' );
diff --git a/includes/diff/DiffFormatter.php b/includes/diff/DiffFormatter.php
index 428e97d833..66faea860b 100644
--- a/includes/diff/DiffFormatter.php
+++ b/includes/diff/DiffFormatter.php
@@ -66,6 +66,8 @@ abstract class DiffFormatter {
 
 		$this->startDiff();
 
+		// Initialize $x0 and $y0 to prevent IDEs from getting confused.
+		$x0 = $y0 = 0;
 		foreach ( $diff->edits as $edit ) {
 			if ( $edit->type == 'copy' ) {
 				if ( is_array( $block ) ) {
@@ -117,11 +119,12 @@ abstract class DiffFormatter {
 	}
 
 	/**
-	 * @param $xbeg
-	 * @param $xlen
-	 * @param $ybeg
-	 * @param $ylen
+	 * @param int $xbeg
+	 * @param int $xlen
+	 * @param int $ybeg
+	 * @param int $ylen
 	 * @param $edits
+	 * @throws MWException
 	 */
 	protected function block( $xbeg, $xlen, $ybeg, $ylen, &$edits ) {
 		wfProfileIn( __METHOD__ );