(bug 13584) New hook: SkinTemplateToolboxEnd

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c41d10a..3a0d2a9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -95,6 +95,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 889) Improve conflict-handling between shared upload repository
   and local one
 * Update documentation links in auto-generated LocalSettings.php
+* (bug 13584) The new hook SkinTemplateToolboxEnd was added.
 
 === Bug fixes in 1.13 ===
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 886190b..5b02bff 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -791,6 +791,9 @@ $title: title of the message (string)
 $message: value (string), change it to the message you want to define
 
 'MonoBookTemplateToolboxEnd': Called by Monobook skin after toolbox links have been rendered (useful for adding more)
+Note: this is only run for the Monobook skin.  To add items to the toolbox
+for all 'SkinTemplate'-type skins, use the SkinTemplateToolboxEnd hook
+instead.
 $tools: array of tools
 
 'OutputPageBeforeHTML': a page has been processed by the parser and
@@ -1005,6 +1008,9 @@ $checkEdit: Whether or not the action=edit query should be added if appropriate.
 $sktemplate: SkinTemplate object
 $content_actions: array of tabs
 
+'SkinTemplateToolboxEnd': Called by SkinTemplate skins after toolbox links have been rendered (useful for adding more)
+$tools: array of tools
+
 'SpecialContributionsBeforeMainOutput': Before the form on Special:Contributions
 $id: User identifier
 

diff --git a/skins/Modern.php b/skins/Modern.php
index 9377cbf..433d14b 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -224,8 +224,9 @@ class ModernTemplate extends QuickTemplate {
                } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
                                <li id="t-ispermalink"<?php echo $skin->tooltip('t-ispermalink') ?>><?php $this->msg('permalink') ?></li><?php
                }
-?>
-                       </ul>
+
+               wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
+?>                     </ul>
                </div><!-- pBody -->
        </div><!-- portlet -->
 

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 4774e20..c97eea8 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -223,6 +223,7 @@ class MonoBookTemplate extends QuickTemplate {
                }
 
                wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
+               wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
 ?>
                        </ul>
                </div>