Revert due to brion's request.

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 0da7d95..16db940 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -241,9 +241,6 @@ you're going to add events to the MediaWiki code.
 $user: the User object about to be created (read-only, incomplete)
 $message: out parameter: error message to display on abort
 
-'AddMagicWordsXX': Add magic words to the language with the code XX (e.g. En, De).
-$magicWords: The magic words array in the specified language.
-
 'AddNewAccount': after a user account is created
 $user: the User object that was created. (Parameter added in 1.7)
 

diff --git a/docs/magicword.txt b/docs/magicword.txt
deleted file mode 100644 (file)
index ee5a940..0000000
--- a/docs/magicword.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-magicword.txt
-
-Magic Words are some phrases used in the wikitext. They are defined in several arrays:
-* $magicWords (includes/MagicWord.php) includes their internal names ('MAG_XXX').
-* $wgVariableIDs (includes/MagicWord.php) includes their IDs (MAG_XXX, which are constants),
-  after their internal names are used for "define()".
-* Localized arrays (languages/LanguageXX.php) include their different names to be used by the users.
-
-The localized arrays keys are the internal IDs, and the values are an array, whose include their
-case-sensitivity and their alias forms. The first form defined is used by the program, for example,
-when moving a page and its old name should include #REDIRECT.
-
-Adding magic words should be done using several hooks:
-* "MagicWordMagicWords" should be used to add the internal name ('MAG_XXX') to $magicWords.
-* "MagicWordwgVariableIDs" should be used to add the ID (MAG_XXX constant) to $wgVariableIDs.
-* "AddMagicWordsXX" (XX is the language code, e.g. En or De) should be used to add the
-  different names of the magic word. Use both the localized name and the English name.
-
-For example:
-
-$wgHooks['MagicWordMagicWords'][] = 'wfAddCustomMagicWord';
-$wgHooks['MagicWordwgVariableIDs'][] = 'wfAddCustomMagicWordID';
-$wgHooks['AddMagicWordsEn'][] = 'wfAddCustomMagicWordEn';
-$wgHooks['AddMagicWordsEs'][] = 'wfAddCustomMagicWordEs';
-
-function wfAddCustomMagicWord( &$magicWords ) {
-       $magicWords[] = 'MAG_CUSTOM';
-}
-
-function wfAddCustomMagicWordID( &$magicWords ) {
-       $magicWords[] = MAG_CUSTOM;
-}
-
-function wfAddCustomMagicWordEn( &$magicWords ) {
-       $magicWords[MAG_CUSTOM] = array( 0, "#custom" );
-}
-
-function wfAddCustomMagicWordEs( &$magicWords ) {
-       $magicWords[MAG_CUSTOM] = array( 0, "#aduanero", "#custom" );
-}

diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php
index d6e29d0..e55b1e7 100644 (file)
--- a/languages/LanguageBe.php
+++ b/languages/LanguageBe.php
@@ -148,7 +148,6 @@ class LanguageBe extends LanguageUtf8 {
                        NS_CATEGORY_TALK  => 'Абмеркаваньне_катэгорыі'
                );
 
-               wfRunHooks( 'AddMagicWordsBe', array( &$this->mMagicWordsBe ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php
index b4a77b3..da60098 100644 (file)
--- a/languages/LanguageBg.php
+++ b/languages/LanguageBg.php
@@ -95,7 +95,6 @@
        MAG_CURRENTDOW           => array( 1, 'CURRENTDOW'             ),
        MAG_REVISIONID           => array( 1, 'REVISIONID'             ),
 );
-wfRunHooks( 'AddMagicWordsBg', array( &$wgMagicWordsBg ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesBg.php');

diff --git a/languages/LanguageBs.php b/languages/LanguageBs.php
index 1a75c0a..21dadc8 100644 (file)
--- a/languages/LanguageBs.php
+++ b/languages/LanguageBs.php
@@ -125,8 +125,6 @@ class LanguageBs extends LanguageUtf8 {
                        NS_CATEGORY         => 'Kategorija',
                        NS_CATEGORY_TALK    => 'Razgovor_o_kategoriji',
                );
-               
-               wfRunHooks( 'AddMagicWordsBs', array( &$this->mMagicWordsBs ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 7768a8a..0265c6f 100644 (file)
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -100,7 +100,6 @@ default:
        MAG_SERVER               => array( 0,    'SERVER'                 ),
        MAG_REVISIONID           => array( 1,    'REVISIONID',       'IDREVIZE'           )
 );
-wfRunHooks( 'AddMagicWordsCs', array( &$wgMagicWordsCs ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesCs.php');

diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index d0a6dd1..840248c 100644 (file)
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -76,7 +76,6 @@
        MAG_INT                  => array( 0,    "INT:"                                       )
 
 );
-wfRunHooks( 'AddMagicWordsCy', array( &$wgMagicWordsCy ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesCy.php');

diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php
index 859b678..e806733 100644 (file)
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -85,7 +85,6 @@ class LanguageEt extends LanguageUtf8 {
                        NS_CATEGORY_TALK    => 'Kategooria_arutelu'
                );
 
-               wfRunHooks( 'AddMagicWordsEt', array( &$this->mMagicWordsEt ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index 77cbb5f..02e00c8 100644 (file)
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -114,8 +114,7 @@ class LanguageGa extends LanguageUtf8 {
                        NS_CATEGORY         => 'Catagóir',
                        NS_CATEGORY_TALK    => 'Plé_catagóire'
                );
-               
-               wfRunHooks( 'AddMagicWordsGa', array( &$this->mMagicWordsGa ) );
+
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php
index dc896d4..63d5077 100644 (file)
--- a/languages/LanguageHe.php
+++ b/languages/LanguageHe.php
@@ -157,8 +157,6 @@ class LanguageHe extends LanguageUtf8 {
                        NS_CATEGORY       => "קטגוריה",
                        NS_CATEGORY_TALK  => "שיחת_קטגוריה",
                );
-               
-               wfRunHooks( 'AddMagicWordsHe', array( &$this->mMagicWordsHe ) );
        }
        
        /**

diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php
index 05c343b..97c5aa3 100644 (file)
--- a/languages/LanguageIs.php
+++ b/languages/LanguageIs.php
@@ -67,8 +67,7 @@ class LanguageIs extends LanguageUtf8 {
                        NS_CATEGORY       => 'Flokkur',
                        NS_CATEGORY_TALK  => 'Flokkaspjall'
                );
-               
-               wfRunHooks( 'AddMagicWordsIs', array( &$this->mMagicWordsIs ) );
+
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index 914a252..1d5318d 100644 (file)
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -91,7 +91,6 @@
        MAG_CURRENTDOW                  =>      array( 1, 'CURRENTDOW' ),
        MAG_REVISIONID                  =>      array( 1, 'REVISIONID' ),
 );
-wfRunHooks( 'AddMagicWordsMk', array( &$wgMagicWordsMk ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesMk.php');

diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php
index 3b0f58d..e55f585 100644 (file)
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -99,8 +99,7 @@ class LanguageNds extends LanguageUtf8 {
                        NS_CATEGORY         => 'Kategorie',
                        NS_CATEGORY_TALK    => 'Kategorie_Diskuschoon'
                );
-               
-               wfRunHooks( 'AddMagicWordsNds', array( &$this->mMagicWordsNds ) );
+
        }
 
        function getBookstoreList() {

diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index 74d9627..e21164b 100644 (file)
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -116,7 +116,6 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW', 'VEKEDAGNRNO', 'UKEDAGNRNÅ'                              ),
        MAG_REVISIONID           => array( 1,    'REVISIONID', 'VERSJONSID'                                             )
 ) + $wgMagicWordsEn;
-wfRunHooks( 'AddMagicWordsNn', array( &$wgMagicWordsNn ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesNn.php');

diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index 12729a4..47f8f95 100644 (file)
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -131,7 +131,6 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
        MAG_REVISIONID           => array( 1,    'REVISIONID'             ),
 );
-wfRunHooks( 'AddMagicWordsPt', array( &$wgMagicWordsPt ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesPt.php');

diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php
index d45f2b5..1cac3d0 100644 (file)
--- a/languages/LanguageRo.php
+++ b/languages/LanguageRo.php
@@ -77,8 +77,7 @@ class LanguageRo extends LanguageUtf8 {
                        NS_CATEGORY       => 'Categorie',
                        NS_CATEGORY_TALK  => 'Discuţie_Categorie'
                );
-               
-               wfRunHooks( 'AddMagicWordsRo', array( &$this->mMagicWordsRo ) );
+
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 9cc35ca..4b1b385 100644 (file)
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -109,7 +109,6 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW','ТЕКУЩИЙДЕНЬНЕДЕЛИ'),
        MAG_REVISIONID           => array( 1,    'REVISIONID', 'ИДВЕРСИИ'),
 );
-wfRunHooks( 'AddMagicWordsRu', array( &$wgMagicWordsRu ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesRu.php');

diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index b0b1dbd..be50900 100644 (file)
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -115,8 +115,6 @@ class LanguageSk extends LanguageUtf8 {
                        NS_CATEGORY       => 'Kategória',
                        NS_CATEGORY_TALK  => 'Diskusia_ku_kategórii'
                );
-               
-               wfRunHooks( 'AddMagicWordsSk', array( &$this->mMagicWordsSk ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageSr_ec.php b/languages/LanguageSr_ec.php
index 7abf730..bacca1b 100644 (file)
--- a/languages/LanguageSr_ec.php
+++ b/languages/LanguageSr_ec.php
@@ -114,7 +114,6 @@ require_once( "LanguageUtf8.php" );
        MAG_LC                   => array( 0, 'LC:', 'ЛЦ:' ),
        MAG_UC                   => array( 0, 'UC:', 'УЦ:' ),
 );
-wfRunHooks( 'AddMagicWordsSr_ec', array( &$wgMagicWordsSr_ec ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesSr_ec.php');

diff --git a/languages/LanguageSr_el.php b/languages/LanguageSr_el.php
index 395c022..2c56bd8 100644 (file)
--- a/languages/LanguageSr_el.php
+++ b/languages/LanguageSr_el.php
@@ -114,7 +114,6 @@ require_once( "LanguageUtf8.php" );
        MAG_LC                   => array( 0, 'LC:', 'LC:' ),
        MAG_UC                   => array( 0, 'UC:', 'UC:' ),
 );
-wfRunHooks( 'AddMagicWordsSr_el', array( &$wgMagicWordsSr_el ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesSr_el.php');

diff --git a/languages/LanguageTt.php b/languages/LanguageTt.php
index de72899..80eec2a 100644 (file)
--- a/languages/LanguageTt.php
+++ b/languages/LanguageTt.php
@@ -73,7 +73,6 @@ require_once( "LanguageUtf8.php" );
        MAG_LOCALURLE            => array( 0,    'URINLIURLE:'             ),
        MAG_SERVER               => array( 0,    'SERVER'                 )
 ) + $wgMagicWordsEn;
-wfRunHooks( 'AddMagicWordsTt', array( &$wgMagicWordsTt ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesTt.php');

diff --git a/languages/LanguageVi.php b/languages/LanguageVi.php
index c3c8f8c..b9ba462 100644 (file)
--- a/languages/LanguageVi.php
+++ b/languages/LanguageVi.php
@@ -89,7 +89,6 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
        MAG_REVISIONID           => array( 1,    'REVISIONID'  , 'SỐBẢN'           ),
  );
-wfRunHooks( 'AddMagicWordsVi', array( &$wgMagicWordsVi ) );
 
 /* private */ $wgDateFormatsVi = array(
     MW_DATE_DEFAULT => 'Không lựa chọn',