From 8230d93a43f2daefac5789e6f93f962777d489b6 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sat, 19 Feb 2011 21:44:20 +0000 Subject: [PATCH] Explicitally define variables --- includes/diff/DifferenceEngine.php | 12 ++++++++++++ includes/diff/WikiDiff.php | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 63bcfb6439..c06b76958d 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -25,8 +25,16 @@ class DifferenceEngine { var $mOldid, $mNewid, $mTitle; var $mOldtitle, $mNewtitle, $mPagetitle; var $mOldtext, $mNewtext; + + /** + * @var Title + */ var $mOldPage, $mNewPage; var $mRcidMarkPatrolled; + + /** + * @var Revision + */ var $mOldRev, $mNewRev; var $mRevisionsLoaded = false; // Have the revisions been loaded var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2? @@ -401,6 +409,10 @@ CONTROL; wfProfileOut( __METHOD__ ); } + /** + * @param $rev Revision + * @return String + */ protected function revisionDeleteLink( $rev ) { global $wgUser; $link = ''; diff --git a/includes/diff/WikiDiff.php b/includes/diff/WikiDiff.php index 3c31119952..1f88192825 100644 --- a/includes/diff/WikiDiff.php +++ b/includes/diff/WikiDiff.php @@ -137,6 +137,13 @@ class _DiffEngine { protected $xchanged, $ychanged; + protected $xv = array(), $yv = array(); + protected $xind = array(), $yind = array(); + + protected $seq = array(), $in_seq = array(); + + protected $lcs = 0; + function diff ( $from_lines, $to_lines ) { wfProfileIn( __METHOD__ ); @@ -841,8 +848,7 @@ class DiffFormatter { } } $context = $edit->orig; - } - else { + } else { if ( ! is_array( $block ) ) { $context = array_slice( $context, sizeof( $context ) - $nlead ); $x0 = $xi - sizeof( $context ); -- 2.20.1