| Index: trunk/phase3/includes/MessageCache.php |
| — | — | @@ -644,23 +644,22 @@ |
| 645 | 645 | return false; |
| 646 | 646 | } elseif( $entry === '!TOO BIG' ) { |
| 647 | 647 | // Fall through and try invididual message cache below |
| | 648 | + } |
| | 649 | + } else { |
| | 650 | + // XXX: This is not cached in process cache, should it? |
| | 651 | + $message = false; |
| | 652 | + wfRunHooks('MessagesPreLoad', array( $title, &$message ) ); |
| | 653 | + if ( $message !== false ) { |
| | 654 | + return $message; |
| | 655 | + } |
| 648 | 656 | |
| 649 | | - } else { |
| 650 | | - // XXX: This is not cached in process cache, should it? |
| 651 | | - $message = false; |
| 652 | | - wfRunHooks('MessagesPreLoad', array( $title, &$message ) ); |
| 653 | | - if ( $message !== false ) { |
| 654 | | - return $message; |
| 655 | | - } |
| 656 | | - |
| 657 | | - /* If message cache is in normal mode, it is guaranteed |
| 658 | | - * (except bugs) that there is always entry (or placeholder) |
| 659 | | - * in the cache if message exists. Thus we can do minor |
| 660 | | - * performance improvement and return false early. |
| 661 | | - */ |
| 662 | | - if ( !$wgAdaptiveMessageCache ) { |
| 663 | | - return false; |
| 664 | | - } |
| | 657 | + /* If message cache is in normal mode, it is guaranteed |
| | 658 | + * (except bugs) that there is always entry (or placeholder) |
| | 659 | + * in the cache if message exists. Thus we can do minor |
| | 660 | + * performance improvement and return false early. |
| | 661 | + */ |
| | 662 | + if ( !$wgAdaptiveMessageCache ) { |
| | 663 | + return false; |
| 665 | 664 | } |
| 666 | 665 | } |
| 667 | 666 | |