* Changed wfMsgNoDBForContent() call to wfMessage(); also switched to user's language...

* Marked wfMsgNoDBForContent() as deprecated and added wfDeprecated() call; the call in LoadBalancer was the only one in core and extensions
* Also added call to wfDeprecated() in wfMsgWeirdKey(); no call in core or extensions

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index ff59662..4ba0c7c 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -590,8 +590,11 @@ function wfMsgNoDB( $key ) {
 
 /**
  * Get a message from the language file, for the content
+ *
+ * @deprecated in 1.18; use wfMessage()
  */
 function wfMsgNoDBForContent( $key ) {
+       wfDeprecated( __FUNCTION__ );
        global $wgForceUIMsgAsContentMsg;
        $args = func_get_args();
        array_shift( $args );
@@ -629,6 +632,7 @@ function wfMsgReal( $key, $args, $useDB = true, $forContent = false, $transform
  * @param $key String
  */
 function wfMsgWeirdKey( $key ) {
+       wfDeprecated( __FUNCTION__ );
        $source = wfMsgGetKey( $key, false, true, false );
        if ( wfEmptyMsg( $key ) ) {
                return '';

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 42b4aa6..0f039a0 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -221,7 +221,7 @@ class LoadBalancer {
                                        $i = $this->getRandomNonLagged( $currentLoads, $wiki );
                                        if ( $i === false && count( $currentLoads ) != 0 )  {
                                                # All slaves lagged. Switch to read-only mode
-                                               $wgReadOnly = wfMsgNoDBForContent( 'readonly_lag' );
+                                               $wgReadOnly = wfMessage( 'readonly_lag' )->useDatabase( false )->plain();
                                                $i = $this->pickRandom( $currentLoads );
                                                $laggedSlaveMode = true;
                                        }