| Index: branches/wmf/1.16wmf4/includes/diff/DifferenceInterface.php |
| — | — | @@ -421,8 +421,10 @@ |
| 422 | 422 | $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' ); |
| 423 | 423 | } |
| 424 | 424 | |
| | 425 | + $pCache = true; |
| 425 | 426 | if( !$this->mNewRev->isCurrent() ) { |
| 426 | 427 | $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false ); |
| | 428 | + $pCache = false; |
| 427 | 429 | } |
| 428 | 430 | |
| 429 | 431 | $this->loadNewText(); |
| — | — | @@ -441,6 +443,14 @@ |
| 442 | 444 | $wgOut->addHTML( htmlspecialchars( $this->mNewtext ) ); |
| 443 | 445 | $wgOut->addHTML( "\n</pre>\n" ); |
| 444 | 446 | } |
| | 447 | + } elseif( $pCache ) { |
| | 448 | + $article = new Article( $this->mTitle, 0 ); |
| | 449 | + $pOutput = ParserCache::singleton()->get( $article, $wgUser ); |
| | 450 | + if( $pOutput ) { |
| | 451 | + $wgOut->addParserOutput( $pOutput ); |
| | 452 | + } else { |
| | 453 | + $article->doViewParse(); |
| | 454 | + } |
| 445 | 455 | } else { |
| 446 | 456 | $wgOut->addWikiTextTidy( $this->mNewtext ); |
| 447 | 457 | } |
| Property changes on: branches/wmf/1.16wmf4/includes/diff/DifferenceInterface.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 448 | 458 | Merged /branches/sqlite/includes/diff/DifferenceInterface.php:r58211-58321 |
| 449 | 459 | Merged /trunk/phase3/includes/diff/DifferenceInterface.php:r63549,63764,63897-63901,64802,69191,69204 |
| 450 | 460 | Merged /branches/wmf-deployment/includes/diff/DifferenceInterface.php:r53381,60970 |
| 451 | 461 | Merged /branches/REL1_15/phase3/includes/diff/DifferenceInterface.php:r51646 |