Reverting this patch:

* (bug 4104) 'OutputPageBeforeHTML' hook to postprocess article HTML on
  page view (comes after parser cache, if used). Patch by ThomasV.
Something still bugged in this; was saving bogus history entries to parser cache.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d32ee95..708c3d7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -477,8 +477,6 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 1103) Fix up redirect handling for images, categories
   Redirects are now followed from the top-level, outside of the Article
   content loading and viewing, for clarity and consistency.
-* (bug 4104) 'OutputPageBeforeHTML' hook to postprocess article HTML on
-  page view (comes after parser cache, if used). Patch by ThomasV.
 * Linker::formatComment corrupted the passed title object on PHP 5
   if the comment included a section link. Use clone() to make a safe copy.
 * Add wfClone() wrapper since we're still using PHP 4 on some servers.

diff --git a/includes/Article.php b/includes/Article.php
index 82891fc..555f5bb 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -875,8 +875,7 @@ class Article {
                                if( !$this->isCurrent() ) {
                                        $oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
                                }
-                               # Display content and don't save to parser cache
-                               $wgOut->addPrimaryWikiText( $text, $this, false );
+                               $wgOut->addWikiText( $text );
 
                                if( !$this->isCurrent() ) {
                                        $wgOut->mParserOptions->setEditSection( $oldEditSectionSetting );

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index f04bc64..7201e6e 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -309,16 +309,12 @@ class OutputPage {
                $parserOutput = $wgParser->parse( $text, $article->mTitle,
                        $this->mParserOptions, true, true, $this->mRevisionId );
 
-               if ( $cache && $article && $parserOutput->getCacheTime() != -1 ) {
+               if ( $article && $parserOutput->getCacheTime() != -1 ) {
                        $parserCache =& ParserCache::singleton();
                        $parserCache->save( $parserOutput, $article, $wgUser );
                }
 
-               $this->addParserOutputNoText( $parserOutput );
-               $text = $parserOutput->getText();
-               wfRunHooks( 'OutputPageBeforeHTML',array( &$this, &$text ) );
-               $parserOutput->setText( $text );
-               $this->addHTML( $parserOutput->getText() );
+               $this->addParserOutput( $parserOutput );
        }
 
        /**
@@ -355,9 +351,7 @@ class OutputPage {
                        $this->mLanguageLinks += $parserOutput->getLanguageLinks();
                        $this->addCategoryLinks( $parserOutput->getCategories() );
                        $this->addKeywords( $parserOutput );
-                       $text = $parserOutput->getText();
-                       wfRunHooks( 'OutputPageBeforeHTML', array( &$this, &$text ) );
-                       $this->addHTML( $text );
+                       $this->addHTML( $parserOutput->getText() );
                        $t = $parserOutput->getTitleText();
                        if( !empty( $t ) ) {
                                $this->setPageTitle( $t );