Merge "Added "maxPartitionsTry" option to JobQueueFederated"

[lhc/web/wiklou.git] / includes / parser / Tidy.php

diff --git a/includes/parser/Tidy.php b/includes/parser/Tidy.php
index 4994d3e..32b16aa 100644 (file)
--- a/includes/parser/Tidy.php
+++ b/includes/parser/Tidy.php
@@ -61,7 +61,10 @@ class MWTidyWrapper {
 
                // Replace <mw:editsection> elements with placeholders
                $wrappedtext = preg_replace_callback( ParserOutput::EDITSECTION_REGEX,
-                       array( &$this, 'replaceEditSectionLinksCallback' ), $text );
+                       array( &$this, 'replaceCallback' ), $text );
+               // ...and <mw:toc> markers
+               $wrappedtext = preg_replace_callback( '/\<\\/?mw:toc\>/',
+                       array( &$this, 'replaceCallback' ), $wrappedtext );
 
                // Modify inline Microdata <link> and <meta> elements so they say <html-link> and <html-meta> so
                // we can trick Tidy into not stripping them out by including them in tidy's new-empty-tags config
@@ -80,7 +83,7 @@ class MWTidyWrapper {
         *
         * @return string
         */
-       function replaceEditSectionLinksCallback( $m ) {
+       function replaceCallback( $m ) {
                $marker = "{$this->mUniqPrefix}-item-{$this->mMarkerIndex}" . Parser::MARKER_SUFFIX;
                $this->mMarkerIndex++;
                $this->mTokens->setPair( $marker, $m[0] );
@@ -118,7 +121,7 @@ class MWTidy {
         * If tidy isn't able to correct the markup, the original will be
         * returned in all its glory with a warning comment appended.
         *
-        * @param $text String: hideous HTML input
+        * @param string $text hideous HTML input
         * @return String: corrected HTML output
         */
        public static function tidy( $text ) {
@@ -158,7 +161,7 @@ class MWTidy {
                global $wgTidyInternal;
 
                $retval = 0;
-               if( $wgTidyInternal ) {
+               if ( $wgTidyInternal ) {
                        $errorStr = self::execInternalTidy( $text, true, $retval );
                } else {
                        $errorStr = self::execExternalTidy( $text, true, $retval );
@@ -171,7 +174,7 @@ class MWTidy {
         * Spawn an external HTML tidy process and get corrected markup back from it.
         * Also called in OutputHandler.php for full page validation
         *
-        * @param $text String: HTML to check
+        * @param string $text HTML to check
         * @param $stderr Boolean: Whether to read result from STDERR rather than STDOUT
         * @param &$retval int Exit code (-1 on internal error)
         * @return mixed String or null
@@ -235,7 +238,7 @@ class MWTidy {
         * Use the HTML tidy extension to use the tidy library in-process,
         * saving the overhead of spawning a new process.
         *
-        * @param $text String: HTML to check
+        * @param string $text HTML to check
         * @param $stderr Boolean: Whether to read result from error status instead of output
         * @param &$retval int Exit code (-1 on internal error)
         * @return mixed String or null
@@ -244,7 +247,7 @@ class MWTidy {
                global $wgTidyConf, $wgDebugTidy;
                wfProfileIn( __METHOD__ );
 
-               if ( !MWInit::classExists( 'tidy' ) ) {
+               if ( !class_exists( 'tidy' ) ) {
                        wfWarn( "Unable to load internal tidy class." );
                        $retval = -1;