From 97667cb3439bfda0bcdd864cae77874999f440e1 Mon Sep 17 00:00:00 2001
From: Alex Monk <krenair@gmail.com>
Date: Wed, 8 Apr 2015 17:19:55 +0100
Subject: [PATCH] Don't ignore content model for default message texts

When an extension decides to change the content model of one of its messages
using ContentHandlerDefaultModelFor, respect that despite the page not
existing.

Bug: T92899
Change-Id: I302d7915bb7b0c768e7130fac195ee0bac5a5101
---
 includes/page/Article.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 91e9971573..25bf844853 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1254,22 +1254,22 @@ class Article implements Page {
 
 		# Show error message
 		$oldid = $this->getOldID();
-		if ( $oldid ) {
-			$text = wfMessage( 'missing-revision', $oldid )->plain();
-		} elseif ( $title->getNamespace() === NS_MEDIAWIKI ) {
-			// Use the default message text
-			$text = $title->getDefaultMessageText();
-		} elseif ( $title->quickUserCan( 'create', $this->getContext()->getUser() )
-			&& $title->quickUserCan( 'edit', $this->getContext()->getUser() )
-		) {
-			$message = $this->getContext()->getUser()->isLoggedIn() ? 'noarticletext' : 'noarticletextanon';
-			$text = wfMessage( $message )->plain();
+		if ( !$oldid && $title->getNamespace() === NS_MEDIAWIKI ) {
+			$outputPage->addParserOutput( $this->getContentObject()->getParserOutput( $title ) );
 		} else {
-			$text = wfMessage( 'noarticletext-nopermission' )->plain();
-		}
-		$text = "<div class='noarticletext'>\n$text\n</div>";
+			if ( $oldid ) {
+				$text = wfMessage( 'missing-revision', $oldid )->plain();
+			} elseif ( $title->quickUserCan( 'create', $this->getContext()->getUser() )
+				&& $title->quickUserCan( 'edit', $this->getContext()->getUser() )
+			) {
+				$message = $this->getContext()->getUser()->isLoggedIn() ? 'noarticletext' : 'noarticletextanon';
+				$text = wfMessage( $message )->plain();
+			} else {
+				$text = wfMessage( 'noarticletext-nopermission' )->plain();
+			}
 
-		$outputPage->addWikiText( $text );
+			$outputPage->addWikiText( "<div class='noarticletext'>\n$text\n</div>" );
+		}
 	}
 
 	/**
-- 
2.20.1