SpecialVersion: Handle Closures in $wgHooks nicer

[lhc/web/wiklou.git] / includes / HtmlFormatter.php
diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php

index ccbfba8..b2926d1 100644 (file)
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -133,7 +133,6 @@ class HtmlFormatter {
          * @return array Array of removed DOMElements
          */
         public function filterContent() {
-               wfProfileIn( __METHOD__ );
                 $removals = $this->parseItemsToRemove();
  
                 // Bail out early if nothing to do
@@ -143,7 +142,6 @@ class HtmlFormatter {
                         },
                         true
                 ) ) {
-                       wfProfileOut( __METHOD__ );
                         return array();
                 }
  
@@ -178,7 +176,7 @@ class HtmlFormatter {
  
                 // CSS Classes
                 $domElemsToRemove = array();
-               $xpath = new DOMXpath( $doc );
+               $xpath = new DOMXPath( $doc );
                 foreach ( $removals['CLASS'] as $classToRemove ) {
                         $elements = $xpath->query( '//*[contains(@class, "' . $classToRemove . '")]' );
  
@@ -202,7 +200,6 @@ class HtmlFormatter {
                         $removed = array_merge( $removed, $this->removeElements( $elements ) );
                 }
  
-               wfProfileOut( __METHOD__ );
                 return $removed;
         }
  
@@ -235,7 +232,6 @@ class HtmlFormatter {
          * @return string
          */
         private function fixLibXML( $html ) {
-               wfProfileIn( __METHOD__ );
                 static $replacements;
                 if ( !$replacements ) {
                         // We don't include rules like '&#34;' => '&amp;quot;' because entities had already been
@@ -249,7 +245,6 @@ class HtmlFormatter {
                 }
                 $html = $replacements->replace( $html );
                 $html = mb_convert_encoding( $html, 'UTF-8', 'HTML-ENTITIES' );
-               wfProfileOut( __METHOD__ );
                 return $html;
         }
  
@@ -264,10 +259,8 @@ class HtmlFormatter {
          * @return string Processed HTML
          */
         public function getText( $element = null ) {
-               wfProfileIn( __METHOD__ );
  
                 if ( $this->doc ) {
-                       wfProfileIn( __METHOD__ . '-dom' );
                         if ( $element !== null && !( $element instanceof DOMElement ) ) {
                                 $element = $this->doc->getElementById( $element );
                         }
@@ -283,9 +276,7 @@ class HtmlFormatter {
                                 $body->appendChild( $element );
                         }
                         $html = $this->doc->saveHTML();
-                       wfProfileOut( __METHOD__ . '-dom' );
  
-                       wfProfileIn( __METHOD__ . '-fixes' );
                         $html = $this->fixLibXml( $html );
                         if ( wfIsWindows() ) {
                                 // Cleanup for CRLF misprocessing of unknown origin on Windows.
@@ -294,7 +285,6 @@ class HtmlFormatter {
                                 // XML code paths if possible and fix there.
                                 $html = str_replace( '&#13;', '', $html );
                         }
-                       wfProfileOut( __METHOD__ . '-fixes' );
                 } else {
                         $html = $this->html;
                 }
@@ -302,14 +292,11 @@ class HtmlFormatter {
                 $html = preg_replace( '/<!--.*?-->|^.*?<body>|<\/body>.*$/s', '', $html );
                 $html = $this->onHtmlReady( $html );
  
-               wfProfileIn( __METHOD__ . '-flatten' );
                 if ( $this->elementsToFlatten ) {
                         $elements = implode( '|', $this->elementsToFlatten );
                         $html = preg_replace( "#</?($elements)\\b[^>]*>#is", '', $html );
                 }
-               wfProfileOut( __METHOD__ . '-flatten' );
  
-               wfProfileOut( __METHOD__ );
                 return $html;
         }
  
@@ -322,6 +309,7 @@ class HtmlFormatter {
          * @param string $type The type of selector (ID, CLASS, TAG_CLASS, or TAG)
          * @param string $rawName The raw name of the selector
          * @return bool Whether the selector was successfully recognised
+        * @throws MWException
          */
         protected function parseSelector( $selector, &$type, &$rawName ) {
                 if ( strpos( $selector, '.' ) === 0 ) {
@@ -349,7 +337,6 @@ class HtmlFormatter {
          * @return array
          */
         protected function parseItemsToRemove() {
-               wfProfileIn( __METHOD__ );
                 $removals = array(
                         'ID' => array(),
                         'TAG' => array(),
@@ -371,7 +358,6 @@ class HtmlFormatter {
                         $removals['TAG'][] = 'video';
                 }
  
-               wfProfileOut( __METHOD__ );
                 return $removals;
         }
  }