fixed profiling; fixed wfMsg() use of memcached; put block log in initialdata.sql

[lhc/web/wiklou.git] / includes / GlobalFunctions.php

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9f28e23..ae0ae5e 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -172,6 +172,7 @@ function wfMsgReal( $key, $args, $useDB ) {
                
        static $l1cache = array();
        $fname = "wfMsg";
+       wfProfileIn( $fname );
        $message = false;
        $l1hit = false;
        
@@ -209,7 +210,7 @@ function wfMsgReal( $key, $args, $useDB ) {
                                $obj = wfFetchObject( $res );
                                $message = $obj->cur_text;
                                wfFreeResult( $res );
-                               $wgMemc->set( $key, $message, time() + 1800 );
+                               $wgMemc->set( $mcKey, $message, 0 /*time() + 1800*/ );
                        }
                }
        }
@@ -226,9 +227,11 @@ function wfMsgReal( $key, $args, $useDB ) {
        if( count( $args ) ) {
                $message = str_replace( $wgReplacementKeys, $args, $message );
        }
+       
+       wfProfileOut( $fname );
 
        if ( "" == $message ) {
-               # Let's at least _try_ to be graceful about this.
+               # Failed, message not translated
                return "<$key>";
        }
        return $message;