| Index: branches/REL1_17/phase3/includes/MessageCache.php |
| — | — | @@ -610,23 +610,12 @@ |
| 611 | 611 | if ( $type == ' ' ) { |
| 612 | 612 | return substr( $entry, 1 ); |
| 613 | 613 | } |
| 614 | | - } else { |
| 615 | | - // XXX: This is not cached in process cache, should it? |
| 616 | | - $message = false; |
| 617 | | - wfRunHooks('MessagesPreLoad', array( $title, &$message ) ); |
| 618 | | - if ( $message !== false ) { |
| 619 | | - return $message; |
| 620 | | - } |
| | 614 | + } |
| 621 | 615 | |
| 622 | | - global $wgAdaptiveMessageCache; |
| 623 | | - /* If message cache is in normal mode, it is guaranteed |
| 624 | | - * (except bugs) that there is always entry (or placeholder) |
| 625 | | - * in the cache if message exists. Thus we can do minor |
| 626 | | - * performance improvement and return false early. |
| 627 | | - */ |
| 628 | | - if ( !$wgAdaptiveMessageCache ) { |
| 629 | | - return false; |
| 630 | | - } |
| | 616 | + # Call message hooks, in case they are defined |
| | 617 | + wfRunHooks('MessagesPreLoad', array( $title, &$message ) ); |
| | 618 | + if ( $message !== false ) { |
| | 619 | + return $message; |
| 631 | 620 | } |
| 632 | 621 | |
| 633 | 622 | $titleKey = wfMemcKey( 'messages', 'individual', $title ); |