Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203053
Change subject: Don't ignore content model for default message texts
......................................................................
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
---
M includes/page/Article.php
1 file changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/203053/1
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 91e9971..25bf844 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1254,22 +1254,22 @@
# 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>" );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/203053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I302d7915bb7b0c768e7130fac195ee0bac5a5101
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
