From 0a5b872a69018ec2d74efe4ddc3910d729b1fd18 Mon Sep 17 00:00:00 2001
From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Sat, 2 Jan 2016 22:49:29 +0100
Subject: [PATCH] Remove $wgCopyrightIcon

Bug: T122754
Depends-On: I3181d4830153d052bff87de5d2347a51fbd5f520
Change-Id: I63cdc0a7fd51ca3a45dc2fd83b22eb58a8de520c
---
 RELEASE-NOTES-1.27           | 2 ++
 includes/DefaultSettings.php | 6 ------
 includes/Setup.php           | 4 +---
 includes/skins/Skin.php      | 6 +++---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index a882ccc9e3..8adb498b7f 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -107,6 +107,8 @@ HHVM 3.1.
 * $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 49503594ee..0e6aabbe7f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6546,12 +6546,6 @@ $wgRightsText = null;
  */
 $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.
  */
diff --git a/includes/Setup.php b/includes/Setup.php
index f7d8d08829..f9150548a3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -123,9 +123,7 @@ if ( isset( $wgFooterIcons['copyright'] )
 	&& 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 3cc1d8f98e..2918cbedb7 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -801,12 +801,12 @@ abstract class Skin extends ContextSource {
 	 * @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 );
 
-- 
2.20.1