Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SkinComponentCopyright: Fix message existence check for history-copyright

Browse source 
Bug: T45646
Change-Id: Ifbe9c7f75feb81f5b2b58793c8995754131cecff
This commit is contained in:
Bartosz Dziewoński 2024-10-15 01:29:33 +02:00
parent d521558b09
commit 9e33ec971a
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
includes/skins/components/SkinComponentCopyright.php
View file

@ -56,13 +56,6 @@ class SkinComponentCopyright implements SkinComponent {
$config = $this->config;
$localizer = $this->localizer;
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
if ( !$isRevisionCurrent
&& !$localizer->msg( 'history_copyright' )->inContentLanguage()->isDisabled()
) {
$type = 'history';
} else {
$type = 'normal';
}
if ( $config->get( MainConfigNames::RightsPage ) ) {
$title = Title::newFromText( $config->get( MainConfigNames::RightsPage ) );
@ -83,8 +76,15 @@ class SkinComponentCopyright implements SkinComponent {
}
if ( $config->get( MainConfigNames::AllowRawHtmlCopyrightMessages ) ) {
// First check whether the old, raw HTML message exists (if not disallowed by wiki config),
// First check whether the old, raw HTML messages exist (if not disallowed by wiki config),
// for compatibility with on-wiki message overrides.
if ( !$isRevisionCurrent && !$localizer->msg( 'history_copyright' )->isDisabled() ) {
$type = 'history';
} else {
$type = 'normal';
}
$msgKey = $type === 'history' ? 'history_copyright' : 'copyright';
// Allow for site and per-namespace customization of copyright notice.
@ -96,6 +96,15 @@ class SkinComponentCopyright implements SkinComponent {
}
}
// TODO: The hook should probably be called with $type === 'history' even if this message
// is disabled, to allow customization, but then we'd probably have to call it again with
// $type === 'normal' if it turns out it's not customized?
if ( !$isRevisionCurrent && !$localizer->msg( 'copyright-footer-history' )->isDisabled() ) {
$type = 'history';
} else {
$type = 'normal';
}
// If it does not exist or disabled, use the new, safer wikitext message.
$msgKey = $type === 'history' ? 'copyright-footer-history' : 'copyright-footer';
$msgSpec = Message::newFromSpecifier( $msgKey )->rawParams( $link );