Merge "Fix "UTPage" creation in tests"

[lhc/web/wiklou.git] / includes / specials / SpecialExpandTemplates.php

diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php
index 19d7a6b..f89f03c 100644 (file)
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -29,16 +29,16 @@
  */
 class SpecialExpandTemplates extends SpecialPage {
 
-       /** @var boolean whether or not to show the XML parse tree */
+       /** @var bool Whether or not to show the XML parse tree */
        protected $generateXML;
 
-       /** @var boolean whether or not to show the raw HTML code */
+       /** @var bool Whether or not to show the raw HTML code */
        protected $generateRawHtml;
 
-       /** @var boolean whether or not to remove comments in the expanded wikitext */
+       /** @var bool Whether or not to remove comments in the expanded wikitext */
        protected $removeComments;
 
-       /** @var boolean whether or not to remove <nowiki> tags in the expanded wikitext */
+       /** @var bool Whether or not to remove <nowiki> tags in the expanded wikitext */
        protected $removeNowiki;
 
        /** @var maximum size in bytes to include. 50MB allows fixing those huge pages */
@@ -61,7 +61,7 @@ class SpecialExpandTemplates extends SpecialPage {
                $title = Title::newFromText( $titleStr );
 
                if ( !$title ) {
-                       $title = $this->getTitle();
+                       $title = $this->getPageTitle();
                }
                $input = $request->getText( 'wpInput' );
                $this->generateXML = $request->getBool( 'wpGenerateXml' );
@@ -125,9 +125,7 @@ class SpecialExpandTemplates extends SpecialPage {
                        }
 
                        $this->showHtmlPreview( $title, $rawhtml, $out );
-
                }
-
        }
 
        /**
@@ -138,7 +136,7 @@ class SpecialExpandTemplates extends SpecialPage {
         * @return string
         */
        private function makeForm( $title, $input ) {
-               $self = $this->getTitle();
+               $self = $this->getPageTitle();
                $form = Xml::openElement(
                        'form',
                        array( 'method' => 'post', 'action' => $self->getLocalUrl() )