Merge "Slight improvements to FormSpecialPage behavior."

[lhc/web/wiklou.git] / includes / content / WikitextContent.php

diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php
index 89aac20..26337db 100644 (file)
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -61,7 +61,8 @@ class WikitextContent extends TextContent {
                $myModelId = $this->getModel();
                $sectionModelId = $with->getModel();
 
-               if ( $sectionModelId != $myModelId  ) {
+               if ( $sectionModelId != $myModelId ) {
+                       wfProfileOut( __METHOD__ );
                        throw new MWException( "Incompatible content model for section: " .
                                "document uses $myModelId but " .
                                "section uses $sectionModelId." );
@@ -219,7 +220,7 @@ class WikitextContent extends TextContent {
         * Returns true if this content is not a redirect, and this content's text
         * is countable according to the criteria defined by $wgArticleCountMethod.
         *
-        * @param $hasLinks Bool  if it is known whether this content contains
+        * @param bool $hasLinks  if it is known whether this content contains
         *    links, provide this information here, to avoid redundant parsing to
         *    find out (default: null).
         * @param $title Title: (default: null)
@@ -231,7 +232,7 @@ class WikitextContent extends TextContent {
        public function isCountable( $hasLinks = null, Title $title = null ) {
                global $wgArticleCountMethod;
 
-               if ( $this->isRedirect( ) ) {
+               if ( $this->isRedirect() ) {
                        return false;
                }
 
@@ -278,9 +279,9 @@ class WikitextContent extends TextContent {
         * @since    1.21
         *
         * @param $title Title
-        * @param $revId int Revision to pass to the parser (default: null)
+        * @param int $revId Revision to pass to the parser (default: null)
         * @param $options ParserOptions (default: null)
-        * @param $generateHtml bool (default: false)
+        * @param bool $generateHtml (default: false)
         *
         * @internal param \IContextSource|null $context
         * @return ParserOutput representing the HTML form of the text