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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 62878c8..5ad5e6f 100644 (file)
--- 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 9463288..86674a8 100644 (file)
--- 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 7e0bb3d..51ea098 100644 (file)
--- 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;
                }