I'm being bold here, proposed solution to:

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index 6440bf0..8f7a950 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -178,15 +178,17 @@ class Skin extends Linker {
 
                wfProfileIn( __METHOD__ );
 
+               # Add favicons and Apple touch icons, if they're not the defaults
+               #
                # Generally the order of the favicon and apple-touch-icon links
                # should not matter, but Konqueror (3.5.9 at least) incorrectly
                # uses whichever one appears later in the HTML source.  Make sure
                # apple-touch-icon is specified first to avoid this.
-               if( false !== $wgAppleTouchIcon ) {
+               if( false !== $wgAppleTouchIcon && wfExpandUrl('/apple-touch-icon.png') != wfExpandUrl($wgAppleTouchIcon) ) {
                        $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
                }
 
-               if( false !== $wgFavicon ) {
+               if( false !== $wgFavicon && wfExpandUrl('/favicon.ico') != wfExpandUrl($wgFavicon) ) {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }
 
@@ -602,6 +604,10 @@ END;
                if( !$wgUser->getOption( 'editsection' ) ) {
                        $s .= ".editsection { display: none; }\n";
                }
+               $fontstyle = $wgUser->getOption( 'editfont' );
+               if ( $fontstyle !== 'default' ) {
+                       $s .= "textarea { font-family: $fontstyle; }\n";
+               }
                return $s;
        }