From ac7fbc3bed7fc9718c66f87c958231af9382b381 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Sun, 14 Nov 2010 19:45:55 +0000 Subject: [PATCH] Follow-up r76434, r76570,r76668: Pass skin object per CR --- docs/hooks.txt | 2 +- includes/Skin.php | 4 ++-- skins/Modern.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/hooks.txt b/docs/hooks.txt index 3ffce51623..407b7f83d5 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1464,7 +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 +$skin: Skin object 'SkinSubPageSubtitle': At the beginning of Skin::subPageSubtitle() &$subpages: Subpage links HTML diff --git a/includes/Skin.php b/includes/Skin.php index d0d1ba29b4..f59742fab2 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1547,11 +1547,11 @@ class Skin extends Linker { * @return string */ function getPoweredBy() { - global $wgStylePath, $wgUser; + global $wgStylePath; $url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" ); $text = 'Powered by MediaWiki'; - wfRunHooks( 'SkinGetPoweredBy', array( &$text, $wgUser->getSkin()->getSkinName() ) ); + wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) ); return $text; } diff --git a/skins/Modern.php b/skins/Modern.php index 6281985bf9..c5bddc63bc 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -26,9 +26,9 @@ class SkinModern extends SkinTemplate { * skin L&F. */ function getPoweredBy() { - global $wgVersion, $wgUser; + global $wgVersion; $text = "
Powered by MediaWiki $wgVersion
"; - wfRunHooks( 'SkinGetPoweredBy', array( &$text, $wgUser->getSkin()->getSkinName() ) ); + wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) ); return $text; } -- 2.20.1