| Index: trunk/phase3/includes/diff/WikiDiff.php |
| — | — | @@ -137,6 +137,13 @@ |
| 138 | 138 | |
| 139 | 139 | protected $xchanged, $ychanged; |
| 140 | 140 | |
| | 141 | + protected $xv = array(), $yv = array(); |
| | 142 | + protected $xind = array(), $yind = array(); |
| | 143 | + |
| | 144 | + protected $seq = array(), $in_seq = array(); |
| | 145 | + |
| | 146 | + protected $lcs = 0; |
| | 147 | + |
| 141 | 148 | function diff ( $from_lines, $to_lines ) { |
| 142 | 149 | wfProfileIn( __METHOD__ ); |
| 143 | 150 | |
| — | — | @@ -841,8 +848,7 @@ |
| 842 | 849 | } |
| 843 | 850 | } |
| 844 | 851 | $context = $edit->orig; |
| 845 | | - } |
| 846 | | - else { |
| | 852 | + } else { |
| 847 | 853 | if ( ! is_array( $block ) ) { |
| 848 | 854 | $context = array_slice( $context, sizeof( $context ) - $nlead ); |
| 849 | 855 | $x0 = $xi - sizeof( $context ); |
| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -25,8 +25,16 @@ |
| 26 | 26 | var $mOldid, $mNewid, $mTitle; |
| 27 | 27 | var $mOldtitle, $mNewtitle, $mPagetitle; |
| 28 | 28 | var $mOldtext, $mNewtext; |
| | 29 | + |
| | 30 | + /** |
| | 31 | + * @var Title |
| | 32 | + */ |
| 29 | 33 | var $mOldPage, $mNewPage; |
| 30 | 34 | var $mRcidMarkPatrolled; |
| | 35 | + |
| | 36 | + /** |
| | 37 | + * @var Revision |
| | 38 | + */ |
| 31 | 39 | var $mOldRev, $mNewRev; |
| 32 | 40 | var $mRevisionsLoaded = false; // Have the revisions been loaded |
| 33 | 41 | var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2? |
| — | — | @@ -401,6 +409,10 @@ |
| 402 | 410 | wfProfileOut( __METHOD__ ); |
| 403 | 411 | } |
| 404 | 412 | |
| | 413 | + /** |
| | 414 | + * @param $rev Revision |
| | 415 | + * @return String |
| | 416 | + */ |
| 405 | 417 | protected function revisionDeleteLink( $rev ) { |
| 406 | 418 | global $wgUser; |
| 407 | 419 | $link = ''; |