From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Fri, 25 Nov 2005 23:17:39 +0000 (+0000)
Subject: * Avoid fatal errors during installation by not calling wfRunHooks() during it
X-Git-Tag: 1.6.0~1134
X-Git-Url: http://git.cyclocoop.org/%27http:/code.google.com/p/ie7-js/Three?a=commitdiff_plain;h=7d08ec49e1c17205941243c8287008f7af010a94;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 696df1ec39..d5e3ca0dde 100644
--- 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.