Added to DefaultSettings

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 11077f2..a886751 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5121,6 +5121,7 @@ $wgRepositoryPackageStates = array(
  */
 $wgEnableSelenium = false;
 $wgSeleniumTestConfigs = array();
+$wgSeleniumConfigFile = null;
 
 
 

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index f59aa56..82bd20a 100644 (file)
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -456,21 +456,23 @@ CONTROL;
                                $wgOut->addHTML( htmlspecialchars( $this->mNewtext ) );
                                $wgOut->addHTML( "\n</pre>\n" );
                        }
-               } elseif( $pCache ) {
-                       $article = new Article( $this->mTitle, 0 );
-                       $pOutput = ParserCache::singleton()->get( $article, $wgOut->parserOptions() );
-                       if( $pOutput ) {
-                               $wgOut->addParserOutput( $pOutput );
+               } elseif( wfRunHooks( 'ArticleContentOnDiff', array( $this, &$wgOut ) ) ) {
+                       if( $pCache ) {
+                               $article = new Article( $this->mTitle, 0 );
+                               $pOutput = ParserCache::singleton()->get( $article, $wgOut->parserOptions() );
+                               if( $pOutput ) {
+                                       $wgOut->addParserOutput( $pOutput );
+                               } else {
+                                       $article->doViewParse();
+                               }
                        } else {
-                               $article->doViewParse();
+                               $wgOut->addWikiTextTidy( $this->mNewtext );
                        }
-               } else {
-                       $wgOut->addWikiTextTidy( $this->mNewtext );
-               }
+                       if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) {
+                               $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
+                       }
+               } 
 
-               if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) {
-                       $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
-               }
                # Add redundant patrol link on bottom...
                if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) {
                        $sk = $wgUser->getSkin();