| Index: branches/wmf-deployment/includes/LocalisationCache.php |
| — | — | @@ -576,9 +576,6 @@ |
| 577 | 577 | $allData['defaultUserOptionOverrides'] = array(); |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | | - # Set the preload key |
| 581 | | - $allData['preload'] = $this->buildPreload( $allData ); |
| 582 | | - |
| 583 | 580 | # Set the list keys |
| 584 | 581 | $allData['list'] = array(); |
| 585 | 582 | foreach ( self::$splitKeys as $key ) { |
| — | — | @@ -593,6 +590,9 @@ |
| 594 | 591 | 'Check that your languages/messages/MessagesEn.php file is intact.' ); |
| 595 | 592 | } |
| 596 | 593 | |
| | 594 | + # Set the preload key |
| | 595 | + $allData['preload'] = $this->buildPreload( $allData ); |
| | 596 | + |
| 597 | 597 | # Save to the process cache and register the items loaded |
| 598 | 598 | $this->data[$code] = $allData; |
| 599 | 599 | foreach ( $allData as $key => $item ) { |
| Property changes on: branches/wmf-deployment/includes/LocalisationCache.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 600 | 600 | + /branches/REL1_15/phase3/includes/LocalisationCache.php:51646 |
| /branches/wmf-deployment/includes/LocalisationCache.php:53381 |
| /trunk/phase3/includes/LocalisationCache.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59718,60704,60760,61189,61557,63394 |