| Index: branches/REL1_16/extensions/MultiUpload/SpecialMultipleUpload.php |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | $wgSpecialPageGroups['MultipleUpload'] = 'media'; |
| 38 | 38 | |
| 39 | 39 | // Hooked functions |
| 40 | | -$wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfMultiUploadToolbox'; |
| | 40 | +$wgHooks['SkinTemplateToolboxEnd'][] = 'wfMultiUploadToolbox'; |
| 41 | 41 | $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 'wfSpecialMultiUploadNav'; |
| 42 | 42 | |
| 43 | 43 | // Add the link to Special:MultipleUpload to all SkinTemplate-based skins for users with the 'upload' user right |
| Index: branches/REL1_16/extensions/SemanticMediaWiki/includes/SMW_GlobalFunctions.php |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | $wgHooks['ParserFirstCallInit'][] = 'SMWParserExtensions::registerParserFunctions'; |
| 255 | 255 | |
| 256 | 256 | if ($smwgToolboxBrowseLink) { |
| 257 | | - if (version_compare($wgVersion,'1.13','>')) { |
| | 257 | + if (version_compare($wgVersion,'1.13','>=')) { |
| 258 | 258 | $wgHooks['SkinTemplateToolboxEnd'][] = 'smwfShowBrowseLink'; // introduced only in 1.13 |
| 259 | 259 | } else { |
| 260 | 260 | $wgHooks['MonoBookTemplateToolboxEnd'][] = 'smwfShowBrowseLink'; |
| Index: branches/REL1_16/extensions/Tasks/Tasks.php |
| — | — | @@ -87,7 +87,7 @@ |
| 88 | 88 | $wgHooks['ArticleInsertComplete'][] = 'wfTasksExtensionArticleSaveComplete'; |
| 89 | 89 | $wgHooks['ArticleDeleteComplete'][] = 'wfTasksExtensionArticleDeleteComplete'; |
| 90 | 90 | $wgHooks['SpecialMovepageAfterMove'][] = 'wfTasksExtensionAfterMove'; |
| 91 | | -$wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfTasksExtensionAfterToolbox'; |
| | 91 | +$wgHooks['SkinTemplateToolboxEnd'][] = 'wfTasksExtensionAfterToolbox'; |
| 92 | 92 | $wgHooks['ArticleViewHeader'][] = 'wfTaskExtensionHeaderHook'; |
| 93 | 93 | $wgHooks['EditPage::showEditForm:initial'][] = 'wfTaskExtensionEditFormInitialHook'; |
| 94 | 94 | $wgHooks['ParserTestTables'][] = 'wfTasksTestTables'; |
| Index: branches/REL1_16/extensions/Duplicator/Duplicator.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | function efDuplicator() { |
| 44 | 44 | global $wgHooks; |
| 45 | 45 | $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 'efDuplicatorNavigation'; |
| 46 | | - $wgHooks['MonoBookTemplateToolboxEnd'][] = 'efDuplicatorToolbox'; |
| | 46 | + $wgHooks['SkinTemplateToolboxEnd'][] = 'efDuplicatorToolbox'; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
| Index: branches/REL1_16/extensions/WikiArticleFeeds/WikiArticleFeeds.php |
| — | — | @@ -206,7 +206,11 @@ |
| 207 | 207 | |
| 208 | 208 | # Attach Hooks |
| 209 | 209 | $wgHooks['OutputPageBeforeHTML'][] = 'wfAddWikiFeedHeaders'; |
| 210 | | -$wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfWikiArticleFeedsToolboxLinks'; |
| | 210 | +if ( version_compare( $wgVersion, '1.13', '>=' ) ) { |
| | 211 | + $wgHooks['SkinTemplateToolboxEnd'][] = 'wfWikiArticleFeedsToolboxLinks'; // introduced in 1.13 |
| | 212 | +} else { |
| | 213 | + $wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfWikiArticleFeedsToolboxLinks'; |
| | 214 | +} |
| 211 | 215 | $wgHooks['UnknownAction'][] = 'wfWikiArticleFeedsAction'; |
| 212 | 216 | $wgHooks['ArticlePurge'][] = 'wfPurgeFeedsOnArticlePurge'; |
| 213 | 217 | |
| — | — | @@ -263,7 +267,7 @@ |
| 264 | 268 | |
| 265 | 269 | /** |
| 266 | 270 | * Adds the Wiki feed links to the bottom of the toolbox in Monobook or like-minded skins. |
| 267 | | - * Usage: $wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfWikiArticleFeedsToolboxLinks'; |
| | 271 | + * Usage: $wgHooks['SkinTemplateToolboxEnd'][] = 'wfWikiArticleFeedsToolboxLinks'; |
| 268 | 272 | * @param QuickTemplate $template Instance of MonoBookTemplate or other QuickTemplate |
| 269 | 273 | */ |
| 270 | 274 | function wfWikiArticleFeedsToolboxLinks( $template ) { |
| Index: branches/REL1_16/extensions/LanguageSelector/LanguageSelector.php |
| — | — | @@ -170,7 +170,7 @@ |
| 171 | 171 | if ( $wgLanguageSelectorLocation != LANGUAGE_SELECTOR_MANUAL && $wgLanguageSelectorLocation != LANGUAGE_SELECTOR_AT_TOP_OF_TEXT ) { |
| 172 | 172 | switch ( $wgLanguageSelectorLocation ) { |
| 173 | 173 | case LANGUAGE_SELECTOR_IN_TOOLBOX: |
| 174 | | - $wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfLanguageSelectorSkinHook'; |
| | 174 | + $wgHooks['SkinTemplateToolboxEnd'][] = 'wfLanguageSelectorSkinHook'; |
| 175 | 175 | break; |
| 176 | 176 | default: |
| 177 | 177 | $wgHooks['SkinTemplateOutputPageBeforeExec'][] = 'wfLanguageSelectorSkinTemplateOutputPageBeforeExec'; |
| Index: branches/REL1_16/extensions/LanguageSelector/README |
| — | — | @@ -74,8 +74,8 @@ |
| 75 | 75 | content. This is the default, but it looks quite ugly without extra CSS |
| 76 | 76 | rules applied. |
| 77 | 77 | ** LANGUAGE_SELECTOR_IN_TOOLBOX: inject a dropdown box at the bottom of the |
| 78 | | - toolbox in the sidebar. This only works with the MonoBook skin, or skins |
| 79 | | - explicitly supporting the MonoBookTemplateToolboxEnd hook. |
| | 78 | + toolbox in the sidebar. This doesn't work in all skins, mostly in skin |
| | 79 | + MonoBook, or skins explicitly supporting the SkinTemplateToolboxEnd hook. |
| 80 | 80 | ** LANGUAGE_SELECTOR_AS_PORTLET: inject the language selector as a portlet |
| 81 | 81 | in the sidebar, similar to how interlanguage-links are shown. |
| 82 | 82 | Works with MonoBook skin, may also work with some SkinTemplate-based skins. |
| Index: branches/REL1_16/extensions/EmailPage/EmailPage.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | if ( isset( $_REQUEST['ea-send'] ) ) require_once( $wgPhpMailerClass ); |
| 50 | 50 | |
| 51 | 51 | # Add toolbox and action links |
| 52 | | -if ( $wgEmailPageToolboxLink ) $wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfEmailPageToolboxLink'; |
| | 52 | +if ( $wgEmailPageToolboxLink ) $wgHooks['SkinTemplateToolboxEnd'][] = 'wfEmailPageToolboxLink'; |
| 53 | 53 | if ( $wgEmailPageActionLink ) $wgHooks['SkinTemplateTabs'][] = 'wfEmailPageActionLink'; |
| 54 | 54 | |
| 55 | 55 | function wfEmailPageToolboxLink() { |
| Index: branches/REL1_16/extensions/Contributors/Contributors.php |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | $wgHooks['ArticleSaveComplete'][] = 'efContributorsInvalidateCache'; |
| 51 | 51 | # Good god, this is ludicrous! |
| 52 | 52 | $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 'efContributorsNavigation'; |
| 53 | | - $wgHooks['MonoBookTemplateToolboxEnd'][] = 'efContributorsToolbox'; |
| | 53 | + $wgHooks['SkinTemplateToolboxEnd'][] = 'efContributorsToolbox'; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
| Index: branches/REL1_16/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
| — | — | @@ -202,7 +202,7 @@ |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | | - if (version_compare($wgVersion,'1.13','>')) { |
| | 206 | + if (version_compare($wgVersion,'1.13','>=')) { |
| 207 | 207 | $wgHooks['SkinTemplateToolboxEnd'][] = 'mvAddToolBoxLinks'; // introduced only in 1.13 |
| 208 | 208 | } else { |
| 209 | 209 | $wgHooks['MonoBookTemplateToolboxEnd'][] = 'mvAddToolBoxLinks'; |
| Index: branches/REL1_16/extensions/Wikidata/misc/FundButton.php |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | |
| 5 | 5 | global $wgHooks; |
| 6 | 6 | |
| 7 | | -$wgHooks['MonoBookTemplateToolboxEnd'][] = 'wfFundHook'; |
| | 7 | +$wgHooks['SkinTemplateToolboxEnd'][] = 'wfFundHook'; |
| 8 | 8 | |
| 9 | 9 | function wfFundHook() { |
| 10 | 10 | $msg = <<<ENDHTML |
| — | — | @@ -32,4 +32,4 @@ |
| 33 | 33 | echo( $msg ); |
| 34 | 34 | return true; |
| 35 | 35 | } |
| 36 | | -?> |
| \ No newline at end of file |
| | 36 | +?> |
| Index: branches/REL1_16/phase3/docs/hooks.txt |
| — | — | @@ -1087,9 +1087,10 @@ |
| 1088 | 1088 | |
| 1089 | 1089 | 'MonoBookTemplateToolboxEnd': Called by Monobook skin after toolbox links have |
| 1090 | 1090 | been rendered (useful for adding more) |
| 1091 | | -Note: this is only run for the Monobook skin. To add items to the toolbox |
| 1092 | | -for all 'SkinTemplate'-type skins, use the SkinTemplateToolboxEnd hook |
| 1093 | | -instead. |
| | 1091 | +Note: this is only run for the Monobook skin. This hook is deprecated and |
| | 1092 | +may be removed in the future. To add items to the toolbox you should use |
| | 1093 | +the SkinTemplateToolboxEnd hook instead, which works for all |
| | 1094 | +'SkinTemplate'-type skins. |
| 1094 | 1095 | $tools: array of tools |
| 1095 | 1096 | |
| 1096 | 1097 | 'NewRevisionFromEditComplete': called when a revision was inserted |
| Index: branches/REL1_16/phase3/RELEASE-NOTES |
| — | — | @@ -49,6 +49,8 @@ |
| 50 | 50 | * (bug 23175) Re-added window.ta variable for backwards compatibility. |
| 51 | 51 | * (bug 23264) Fixed breakage of various command line scripts due to extra line |
| 52 | 52 | endings being inserted by Maintenance::output(). |
| | 53 | +* MonobookTemplateToolboxEnd has been deprecated. Use SkinTemplateToolboxEnd |
| | 54 | + instead. |
| 53 | 55 | |
| 54 | 56 | == Changes since 1.16 beta 2 == |
| 55 | 57 | |