| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -590,8 +590,11 @@ |
| 591 | 591 | |
| 592 | 592 | /** |
| 593 | 593 | * Get a message from the language file, for the content |
| | 594 | + * |
| | 595 | + * @deprecated in 1.18; use wfMessage() |
| 594 | 596 | */ |
| 595 | 597 | function wfMsgNoDBForContent( $key ) { |
| | 598 | + wfDeprecated( __FUNCTION__ ); |
| 596 | 599 | global $wgForceUIMsgAsContentMsg; |
| 597 | 600 | $args = func_get_args(); |
| 598 | 601 | array_shift( $args ); |
| — | — | @@ -629,6 +632,7 @@ |
| 630 | 633 | * @param $key String |
| 631 | 634 | */ |
| 632 | 635 | function wfMsgWeirdKey( $key ) { |
| | 636 | + wfDeprecated( __FUNCTION__ ); |
| 633 | 637 | $source = wfMsgGetKey( $key, false, true, false ); |
| 634 | 638 | if ( wfEmptyMsg( $key ) ) { |
| 635 | 639 | return ''; |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -221,7 +221,7 @@ |
| 222 | 222 | $i = $this->getRandomNonLagged( $currentLoads, $wiki ); |
| 223 | 223 | if ( $i === false && count( $currentLoads ) != 0 ) { |
| 224 | 224 | # All slaves lagged. Switch to read-only mode |
| 225 | | - $wgReadOnly = wfMsgNoDBForContent( 'readonly_lag' ); |
| | 225 | + $wgReadOnly = wfMessage( 'readonly_lag' )->useDatabase( false )->plain(); |
| 226 | 226 | $i = $this->pickRandom( $currentLoads ); |
| 227 | 227 | $laggedSlaveMode = true; |
| 228 | 228 | } |