| Index: trunk/phase3/includes/diff/DifferenceInterface.php |
| — | — | @@ -456,21 +456,23 @@ |
| 457 | 457 | $wgOut->addHTML( htmlspecialchars( $this->mNewtext ) ); |
| 458 | 458 | $wgOut->addHTML( "\n</pre>\n" ); |
| 459 | 459 | } |
| 460 | | - } elseif( $pCache ) { |
| 461 | | - $article = new Article( $this->mTitle, 0 ); |
| 462 | | - $pOutput = ParserCache::singleton()->get( $article, $wgOut->parserOptions() ); |
| 463 | | - if( $pOutput ) { |
| 464 | | - $wgOut->addParserOutput( $pOutput ); |
| | 460 | + } elseif( wfRunHooks( 'ArticleContentOnDiff', array( $this, &$wgOut ) ) ) { |
| | 461 | + if( $pCache ) { |
| | 462 | + $article = new Article( $this->mTitle, 0 ); |
| | 463 | + $pOutput = ParserCache::singleton()->get( $article, $wgOut->parserOptions() ); |
| | 464 | + if( $pOutput ) { |
| | 465 | + $wgOut->addParserOutput( $pOutput ); |
| | 466 | + } else { |
| | 467 | + $article->doViewParse(); |
| | 468 | + } |
| 465 | 469 | } else { |
| 466 | | - $article->doViewParse(); |
| | 470 | + $wgOut->addWikiTextTidy( $this->mNewtext ); |
| 467 | 471 | } |
| 468 | | - } else { |
| 469 | | - $wgOut->addWikiTextTidy( $this->mNewtext ); |
| 470 | | - } |
| | 472 | + if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) { |
| | 473 | + $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting ); |
| | 474 | + } |
| | 475 | + } |
| 471 | 476 | |
| 472 | | - if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) { |
| 473 | | - $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting ); |
| 474 | | - } |
| 475 | 477 | # Add redundant patrol link on bottom... |
| 476 | 478 | if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) { |
| 477 | 479 | $sk = $wgUser->getSkin(); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -5121,6 +5121,7 @@ |
| 5122 | 5122 | */ |
| 5123 | 5123 | $wgEnableSelenium = false; |
| 5124 | 5124 | $wgSeleniumTestConfigs = array(); |
| | 5125 | +$wgSeleniumConfigFile = null; |
| 5125 | 5126 | |
| 5126 | 5127 | |
| 5127 | 5128 | |