From ef9293b1b7f2863a913b38eacaab841db42ee03c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 18 Jan 2012 18:20:50 +0000 Subject: [PATCH] Remove support for the deprecated and no longer used in trunk hook MagicWordMagicWords. --- RELEASE-NOTES-1.19 | 3 ++- docs/hooks.txt | 5 ----- includes/MagicWord.php | 7 ------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 3a13b72a43..a783d45a45 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -302,7 +302,8 @@ changes to languages because of Bugzilla reports. methods have been removed, the variant is now part of the $query argument. * Removed Title::isValidCssJsSubpage(), deprecated since 1.17 in favor of using Title::isCssJsSubpage() or checking Title::isWrongCaseCssJsPage(). -* (bug 24430) Remove number of column for edit field in preference page +* (bug 24430) Remove number of column for edit field in preference page. +* Support for the deprecated hook MagicWordMagicWords was removed. == Compatibility == diff --git a/docs/hooks.txt b/docs/hooks.txt index a9f7c73335..b4b5bb125f 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1264,11 +1264,6 @@ $time: timestamp of the log entry (added in 1.12) 'MaintenanceRefreshLinksInit': before executing the refreshLinks.php maintenance script $refreshLinks: RefreshLinks object -'MagicWordMagicWords': When defining new magic word. -DEPRECATED: use $magicWords in a file listed in -$wgExtensionMessagesFiles instead. -$magicWords: array of strings - 'MagicWordwgVariableIDs': When definig new magic words IDs. $variableIDs: array of strings diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 8559ddadda..b1baafc37c 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -223,13 +223,6 @@ class MagicWord { */ static function getVariableIDs() { if ( !self::$mVariableIDsInitialised ) { - # Deprecated constant definition hook, available for extensions that need it - $magicWords = array(); - wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) ); - foreach ( $magicWords as $word ) { - define( $word, $word ); - } - # Get variable IDs wfRunHooks( 'MagicWordwgVariableIDs', array( &self::$mVariableIDs ) ); self::$mVariableIDsInitialised = true; -- 2.20.1