| Index: branches/REL1_16/phase3/includes/LocalisationCache.php |
| — | — | @@ -586,9 +586,6 @@ |
| 587 | 587 | $allData['defaultUserOptionOverrides'] = array(); |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | | - # Set the preload key |
| 591 | | - $allData['preload'] = $this->buildPreload( $allData ); |
| 592 | | - |
| 593 | 590 | # Set the list keys |
| 594 | 591 | $allData['list'] = array(); |
| 595 | 592 | foreach ( self::$splitKeys as $key ) { |
| — | — | @@ -603,6 +600,9 @@ |
| 604 | 601 | 'Check that your languages/messages/MessagesEn.php file is intact.' ); |
| 605 | 602 | } |
| 606 | 603 | |
| | 604 | + # Set the preload key |
| | 605 | + $allData['preload'] = $this->buildPreload( $allData ); |
| | 606 | + |
| 607 | 607 | # Save to the process cache and register the items loaded |
| 608 | 608 | $this->data[$code] = $allData; |
| 609 | 609 | foreach ( $allData as $key => $item ) { |
| Property changes on: branches/REL1_16/phase3/includes/LocalisationCache.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 610 | 610 | + /branches/REL1_15/phase3/includes/LocalisationCache.php:51646 |
| /branches/sqlite/includes/LocalisationCache.php:58211-58321 |
| /branches/wmf-deployment/includes/LocalisationCache.php:53381 |
| /trunk/phase3/includes/LocalisationCache.php:63394 |