From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 26 Sep 2010 16:37:00 +0000 (+0000)
Subject: * (bug 25292) SkinSubPageSubtitle hook now passes the Skin object as second parameter
X-Git-Tag: 1.31.0-rc.0~34789
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=aac9dd2e569c1cf0fe539f7dac90fa1524c8ea2f;p=lhc%2Fweb%2Fwiklou.git

* (bug 25292) SkinSubPageSubtitle hook now passes the Skin object as second parameter
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 62878c82c5..5ad5e6f833 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -337,6 +337,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 24987) Special:ListUsers does not take external groups into account
 * (bug 20633) update.php has mixed language output
 * SQLite system table names are now never prefixed.
+* (bug 25292) SkinSubPageSubtitle hook now passes the Skin object as second
+  parameter
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 9463288863..86674a8fac 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1444,8 +1444,8 @@ $type: 'normal' or 'history' for old/diff views
 &$forContent: overridable flag if copyright footer is shown in content language. 
 
 'SkinSubPageSubtitle': At the beginning of Skin::subPageSubtitle()
-$skin: Skin object
 &$subpages: Subpage links HTML
+$skin: Skin object
 If false is returned $subpages will be used instead of the HTML
 subPageSubtitle() generates.
 If true is returned, $subpages will be ignored and the rest of
diff --git a/includes/Skin.php b/includes/Skin.php
index 7e0bb3dc60..51ea098b68 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1058,7 +1058,7 @@ class Skin extends Linker {
 	function subPageSubtitle() {
 		$subpages = '';
 
-		if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) ) {
+		if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this ) ) ) {
 			return $subpages;
 		}