Fixed diff-related regression, tidy accidentally disabled

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 6052323..b4806fc 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -213,7 +213,7 @@ CONTROL;
                        $wgOut->setRevisionId( $this->mNewRev->getId() );
                }
 
-               $wgOut->addSecondaryWikiText( $this->mNewtext );
+               $wgOut->addWikiTextTidy( $this->mNewtext );
 
                if( !$this->mNewRev->isCurrent() ) {
                        $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e6b872c..250e631 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -316,7 +316,7 @@ class OutputPage {
        }
 
        function addWikiTextTitleTidy($text, &$title, $linestart = true) {
-               addWikiTextTitle( $text, $title, $linestart, true );
+               $this->addWikiTextTitle( $text, $title, $linestart, true );
        }
 
        public function addWikiTextTitle($text, &$title, $linestart, $tidy = false) {
@@ -397,17 +397,19 @@ class OutputPage {
        }
 
        /**
-        * For anything that isn't primary text or interface message
-        *
-        * @param string $text
-        * @param bool   $linestart Is this the start of a line?
+        * @deprecated use addWikiTextTidy()
         */
        public function addSecondaryWikiText( $text, $linestart = true ) {
                global $wgTitle;
-               $popts = $this->parserOptions();
-               $popts->setTidy(true);
-               $this->addWikiTextTitle($text, $wgTitle, $linestart);
-               $popts->setTidy(false);
+               $this->addWikiTextTitleTidy($text, $wgTitle, $linestart);
+       }
+
+       /**
+        * Add wikitext with tidy enabled
+        */
+       public function addWikiTextTidy(  $text, $linestart = true ) {
+               global $wgTitle;
+               $this->addWikiTextTitleTidy($text, $wgTitle, $linestart);
        }