* When I found it, I cried. fixes bug #22501

* Also, fix up showtitle for parser tests to always give a title, whether we're setting a display title or not.

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index c7cae73..ea5840e 100644 (file)
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -192,6 +192,7 @@ class ParserOutput
                if( $t === '' ) {
                        return false;
                }
+               return $t;
        }
 
        /**

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index 3b2e6f0..6526da9 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -371,7 +371,8 @@ class ParserTest {
                        $out = $output->getText();
 
                        if ( isset( $opts['showtitle'] ) ) {
-                               $out = $output->getTitleText() . "\n$out";
+                               if($output->getTitleText()) $title = $output->getTitleText();
+                               $out = "$title\n$out";
                        }
                        if (isset( $opts['ill'] ) ) {
                                $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) );
@@ -556,8 +557,6 @@ class ParserTest {
                        'wgHtml5' => true,
                        'wgWellFormedXml' => true,
                        'wgAllowMicrodataAttributes' => true,
-                       'wgAllowDisplayTitle' => true,
-                       'wgRestrictDisplayTitle' => false,
                );
 
                if ($config) {

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index c68c10a..023f955 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -7785,10 +7785,13 @@ Bar foo
 Verify that displaytitle works (bug #22501) no displaytitle
 !! options
 showtitle
+!! config
+wgAllowDisplayTitle=true
+wgRestrictDisplayTitle=false
 !! input
 this is not the the title
 !! result
-
+Parser test
 <p>this is not the the title
 </p>
 !! end
@@ -7799,6 +7802,7 @@ Verify that displaytitle works (bug #22501) RestrictDisplayTitle=false
 showtitle
 title=[[Screen]]
 !! config
+wgAllowDisplayTitle=true
 wgRestrictDisplayTitle=false
 !! input
 this is not the the title
@@ -7815,12 +7819,13 @@ Verify that displaytitle works (bug #22501) RestrictDisplayTitle=true mismatch
 showtitle
 title=[[Screen]]
 !! config
+wgAllowDisplayTitle=true
 wgRestrictDisplayTitle=true
 !! input
 this is not the the title
 {{DISPLAYTITLE:whatever}}
 !! result
-
+Screen
 <p>this is not the the title
 </p>
 !! end
@@ -7831,6 +7836,7 @@ Verify that displaytitle works (bug #22501) RestrictDisplayTitle=true matching
 showtitle
 title=[[Screen]]
 !! config
+wgAllowDisplayTitle=true
 wgRestrictDisplayTitle=true
 !! input
 this is not the the title
@@ -7852,7 +7858,7 @@ wgAllowDisplayTitle=false
 this is not the the title
 {{DISPLAYTITLE:screen}}
 !! result
-
+Screen
 <p>this is not the the title
 <a href="/index.php?title=Template:DISPLAYTITLE:screen&amp;action=edit&amp;redlink=1" class="new" title="Template:DISPLAYTITLE:screen (page does not exist)">Template:DISPLAYTITLE:screen</a>
 </p>
@@ -7868,7 +7874,7 @@ wgAllowDisplayTitle=false
 !! input
 this is not the the title
 !! result
-
+Screen
 <p>this is not the the title
 </p>
 !! end