From 49a678e29e5bf90ea7920a68da64825adbf7ebd4 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Sun, 14 Nov 2010 19:28:32 +0000
Subject: [PATCH] Follow-up r76434, r76570: Add skinname per CR

---
 docs/hooks.txt    | 1 +
 includes/Skin.php | 6 ++----
 skins/Modern.php  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/hooks.txt b/docs/hooks.txt
index d97718a739..3ffce51623 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1464,6 +1464,7 @@ $type: 'normal' or 'history' for old/diff views
 'SkinGetPoweredBy'
 &$text: additional 'powered by' icons in HTML.
 Note: Modern skin does not use the MediaWiki icon but plain text instead
+$skin: Name of the skin
 
 'SkinSubPageSubtitle': At the beginning of Skin::subPageSubtitle()
 &$subpages: Subpage links HTML
diff --git a/includes/Skin.php b/includes/Skin.php
index 542f384eb9..d0d1ba29b4 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1547,13 +1547,11 @@ class Skin extends Linker {
 	 * @return string
 	 */
 	function getPoweredBy() {
-		global $wgStylePath;
+		global $wgStylePath, $wgUser;
 
 		$url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
 		$text = '<a href="http://www.mediawiki.org/"><img src="' . $url . '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
-
-		wfRunHooks( 'SkinGetPoweredBy', array( &$text ) );
-
+		wfRunHooks( 'SkinGetPoweredBy', array( &$text, $wgUser->getSkin()->getSkinName() ) );	
 		return $text;
 	}
 
diff --git a/skins/Modern.php b/skins/Modern.php
index f3605f7e06..6281985bf9 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -26,9 +26,9 @@ class SkinModern extends SkinTemplate {
 	 * skin L&F.
 	 */
 	function getPoweredBy() {
-		global	$wgVersion;
+		global $wgVersion, $wgUser;
 		$text = "<div class='mw_poweredby'>Powered by MediaWiki $wgVersion</div>";
-		wfRunHooks( 'SkinGetPoweredBy', array( &$text ) );
+		wfRunHooks( 'SkinGetPoweredBy', array( &$text, $wgUser->getSkin()->getSkinName() ) );
 		return $text;
 	}
 
-- 
2.20.1