From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 8 Mar 2010 14:43:02 +0000 (+0000)
Subject: Build preload l10ncache after running hooks, not before, so extension changes (by... 
X-Git-Tag: 1.31.0-rc.0~37516
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=e46c9a91fd9ab6f9e1e41ffbfb31551a92b95307;p=lhc%2Fweb%2Fwiklou.git

Build preload l10ncache after running hooks, not before, so extension changes (by e.g. LocalisationUpdate) to preloaded messages get picked up.
---

diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index 8ceb49914f..12925b68cd 100644
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -586,9 +586,6 @@ class LocalisationCache {
 			$allData['defaultUserOptionOverrides'] = array();
 		}
 
-		# Set the preload key
-		$allData['preload'] = $this->buildPreload( $allData );
-
 		# Set the list keys
 		$allData['list'] = array();
 		foreach ( self::$splitKeys as $key ) {
@@ -603,6 +600,9 @@ class LocalisationCache {
 				'Check that your languages/messages/MessagesEn.php file is intact.' );
 		}
 
+		# Set the preload key
+		$allData['preload'] = $this->buildPreload( $allData );
+
 		# Save to the process cache and register the items loaded
 		$this->data[$code] = $allData;
 		foreach ( $allData as $key => $item ) {