* Ported $wgCopyrightIcon setting from REL1_3A

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a049130..030d7ea 100644 (file)
--- 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 2c989b0..30d013b 100644 (file)
--- 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>';
                        }
                }