Remove support for the deprecated and no longer used in trunk hook MagicWordMagicWords.

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 3a13b72..a783d45 100644 (file)
--- 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 a9f7c73..b4b5bb1 100644 (file)
--- 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 8559dda..b1baafc 100644 (file)
--- 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;