| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php |
| — | — | @@ -268,10 +268,9 @@ |
| 269 | 269 | * @param Article $article |
| 270 | 270 | * @param string $text |
| 271 | 271 | * @param int $id |
| 272 | | - * @param bool $reparsed (is this being reparsed from fr_text?) |
| 273 | 272 | * @return ParserOutput |
| 274 | 273 | */ |
| 275 | | - public static function parseStableText( $article, $text='', $id, $reparsed = true ) { |
| | 274 | + public static function parseStableText( $article, $text='', $id ) { |
| 276 | 275 | global $wgParser; |
| 277 | 276 | $title = $article->getTitle(); // avoid pass-by-reference error |
| 278 | 277 | # Make our hooks trigger (force unstub so setting doesn't get lost) |
| Index: trunk/extensions/FlaggedRevs/FlaggedRevision.php |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | private $mQuality; |
| 10 | 10 | private $mTags; |
| 11 | 11 | private $mText = null; |
| 12 | | - private $mRawDBText, $mFlags; |
| | 12 | + private $mFlags; |
| 13 | 13 | private $mUser; |
| 14 | 14 | private $mRevision; |
| 15 | 15 | private $mFileName, $mFileSha1, $mFileTimestamp; |
| — | — | @@ -33,7 +33,6 @@ |
| 34 | 34 | $this->mTitle = isset($row->page_namespace) && isset($row->page_title) ? |
| 35 | 35 | Title::makeTitleSafe( $row->page_namespace, $row->page_title ) : null; |
| 36 | 36 | $this->mFlags = isset($row->fr_flags) ? explode(',',$row->fr_flags) : null; |
| 37 | | - $this->mRawDBText = isset($row->fr_text) ? $row->fr_text : null; |
| 38 | 37 | } else if( is_array($row) ) { |
| 39 | 38 | $this->mRevId = intval( $row['fr_rev_id'] ); |
| 40 | 39 | $this->mPageId = intval( $row['fr_page_id'] ); |
| — | — | @@ -48,7 +47,6 @@ |
| 49 | 48 | $this->mUser = intval( $row['fr_user'] ); |
| 50 | 49 | # Optional fields |
| 51 | 50 | $this->mFlags = isset($row['fr_flags']) ? explode(',',$row['fr_flags']) : null; |
| 52 | | - $this->mRawDBText = isset($row['fr_text']) ? $row['fr_text'] : null; |
| 53 | 51 | } else { |
| 54 | 52 | throw new MWException( 'FlaggedRevision constructor passed invalid row format.' ); |
| 55 | 53 | } |
| — | — | @@ -200,7 +198,6 @@ |
| 201 | 199 | public function insertOn( $fulltext, $tmpRows, $fileRows ) { |
| 202 | 200 | # Store/compress text as needed, and get the flags |
| 203 | 201 | $textFlags = FlaggedRevision::doSaveCompression( $fulltext ); |
| 204 | | - $this->mRawDBText = $fulltext; // wikitext or ES url |
| 205 | 202 | $this->mFlags = explode(',',$textFlags); |
| 206 | 203 | $dbw = wfGetDB( DB_MASTER ); |
| 207 | 204 | # Our review entry |
| Index: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php |
| — | — | @@ -559,7 +559,7 @@ |
| 560 | 560 | return $err; |
| 561 | 561 | } |
| 562 | 562 | # Parse the rest and check if it matches up |
| 563 | | - $stableOutput = FlaggedRevs::parseStableText( $article, $fulltext, $rev->getId(), false ); |
| | 563 | + $stableOutput = FlaggedRevs::parseStableText( $article, $fulltext, $rev->getId() ); |
| 564 | 564 | $err =& $stableOutput->fr_includeErrors; |
| 565 | 565 | if( !$noMatch && (!empty($err) || $stableOutput->fr_newestImageTime > $lastImgTime) ) { |
| 566 | 566 | wfProfileOut( __METHOD__ ); |