From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 11 Aug 2009 18:26:14 +0000 (+0000)
Subject: Always define mwEmbed i18n file. Was not compatible with manual recaching and the... 
X-Git-Tag: 1.31.0-rc.0~40352
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=4356486697fd8cf7c047d02092a030786216dd6c;p=lhc%2Fweb%2Fwiklou.git

Always define mwEmbed i18n file. Was not compatible with manual recaching and the performance impact should not matter.
---

diff --git a/includes/Setup.php b/includes/Setup.php
index a1cebaefa5..d57cba19df 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -317,11 +317,7 @@ wfProfileIn( $fname.'-extensions' );
  * this can't be done in a normal extension type way
  * since the script-loader is an entry point
  */
-if( $wgEnableScriptLoader && strpos( wfGetScriptUrl(), "mwScriptLoader.php" ) !== false ){
-	$wgExtensionMessagesFiles['mwEmbed'] = "{$IP}/js2/mwEmbed/php/languages/mwEmbed.i18n.php";
-	wfLoadExtensionMessages( 'mwEmbed' );
-}
-
+$wgExtensionMessagesFiles['mwEmbed'] = "{$IP}/js2/mwEmbed/php/languages/mwEmbed.i18n.php";
 
 # Extension setup functions for extensions other than skins
 # Entries should be added to this variable during the inclusion