jenkins-bot has submitted this change and it was merged.
Change subject: Remove $wgCopyrightIcon
......................................................................
Remove $wgCopyrightIcon
Bug: T122754
Depends-On: I3181d4830153d052bff87de5d2347a51fbd5f520
Change-Id: I63cdc0a7fd51ca3a45dc2fd83b22eb58a8de520c
---
M RELEASE-NOTES-1.27
M includes/DefaultSettings.php
M includes/Setup.php
M includes/skins/Skin.php
4 files changed, 6 insertions(+), 12 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index a882ccc..8adb498 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -107,6 +107,8 @@
* $wgIncludeLegacyJavaScript, deprecated in MediaWiki 1.26, now defaults false.
Extensions, skins, gadgets and scripts that need the
mediawiki.legacy.wikibits
module should express a dependency on it.
+* Removed configuration option $wgCopyrightIcon (deprecated since 1.18). Use
+ $wgFooterIcons['copyright']['copyright'] instead.
=== New features in 1.27 ===
* $wgDataCenterUpdateStickTTL was also added. This decides how long a user
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4950359..0e6aabb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6547,12 +6547,6 @@
$wgRightsIcon = null;
/**
- * Set this to some HTML to override the rights icon with an arbitrary logo
- * @deprecated since 1.18 Use $wgFooterIcons['copyright']['copyright']
- */
-$wgCopyrightIcon = null;
-
-/**
* Set this to true if you want detailed copyright information forms on Upload.
*/
$wgUseCopyrightUpload = false;
diff --git a/includes/Setup.php b/includes/Setup.php
index f7d8d08..f915054 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -123,9 +123,7 @@
&& isset( $wgFooterIcons['copyright']['copyright'] )
&& $wgFooterIcons['copyright']['copyright'] === []
) {
- if ( $wgCopyrightIcon ) {
- $wgFooterIcons['copyright']['copyright'] = $wgCopyrightIcon;
- } elseif ( $wgRightsIcon || $wgRightsText ) {
+ if ( $wgRightsIcon || $wgRightsText ) {
$wgFooterIcons['copyright']['copyright'] = [
'url' => $wgRightsUrl,
'src' => $wgRightsIcon,
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 3cc1d8f..2918cbe 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -801,12 +801,12 @@
* @return null|string
*/
function getCopyrightIcon() {
- global $wgRightsUrl, $wgRightsText, $wgRightsIcon,
$wgCopyrightIcon;
+ global $wgRightsUrl, $wgRightsText, $wgRightsIcon,
$wgFooterIcons;
$out = '';
- if ( $wgCopyrightIcon ) {
- $out = $wgCopyrightIcon;
+ if ( $wgFooterIcons['copyright']['copyright'] ) {
+ $out = $wgFooterIcons['copyright']['copyright'];
} elseif ( $wgRightsIcon ) {
$icon = htmlspecialchars( $wgRightsIcon );
--
To view, visit https://gerrit.wikimedia.org/r/262001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63cdc0a7fd51ca3a45dc2fd83b22eb58a8de520c
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
