* Avoid fatal errors during installation by not calling wfRunHooks() during it

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 696df1e..d5e3ca0 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -69,7 +69,8 @@ $magicWords = array(
        'MAG_FULLPAGENAME',
        'MAG_FULLPAGENAMEE',
 );
-wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
+if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
+       wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
 
 for ( $i = 0; $i < count( $magicWords ); ++$i )
        define( $magicWords[$i], $i );
@@ -99,7 +100,8 @@ $wgVariableIDs = array(
        MAG_CURRENTDOW,
        MAG_REVISIONID,
 );
-wfRunHooks( 'MagicWordwgVariableIDs', array( &$wgVariableIDs ) );
+if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
+       wfRunHooks( 'MagicWordwgVariableIDs', array( &$wgVariableIDs ) );
 
 /**
  * This class encapsulates "magic words" such as #redirect, __NOTOC__, etc.