From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 28 Dec 2004 22:02:19 +0000 (+0000)
Subject: * Ported $wgCopyrightIcon setting from REL1_3A
X-Git-Tag: 1.5.0alpha1~1017
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=227ea90ba976ba0612344e03ba84c6ca2f14c49b;p=lhc%2Fweb%2Fwiklou.git

* Ported $wgCopyrightIcon setting from REL1_3A
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a0491306e5..030d7ea78a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -727,6 +727,9 @@ $wgRightsUrl = NULL;
 $wgRightsText = NULL;
 $wgRightsIcon = NULL;
 
+# Set this to some HTML to override the rights icon with an arbitrary logo
+$wgCopyrightIcon = NULL;
+
 # Set this to true if you want detailed copyright information forms on Upload.
 $wgUseCopyrightUpload = false;
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 2c989b0572..30d013b5a8 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -805,17 +805,19 @@ class Skin extends Linker {
 	}
 
 	function getCopyrightIcon() {
-		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon;
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
 		$out = '';
-		if( $wgRightsIcon ) {
+		if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
+			$out = $wgCopyrightIcon;
+		} else if ( $wgRightsIcon ) {
 			$icon = htmlspecialchars( $wgRightsIcon );
-			if( $wgRightsUrl ) {
+			if ( $wgRightsUrl ) {
 				$url = htmlspecialchars( $wgRightsUrl );
 				$out .= '<a href="'.$url.'">';
 			}
 			$text = htmlspecialchars( $wgRightsText );
 			$out .= "<img src=\"$icon\" alt='$text' />";
-			if( $wgRightsUrl ) {
+			if ( $wgRightsUrl ) {
 				$out .= '</a>';
 			}
 		}