USE INDEX -> DB::useIndexClause()

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9c445c5..8e4937f 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -399,7 +399,7 @@ function wfMsgReal( $key, $args, $useDB, $forContent=false ) {
                }
 
                wfSuppressWarnings();
-               if( is_object( $message ) ) {
+               if( is_object( $lang ) ) {
                        $message = $lang->getMessage( $key );
                } else {
                        $message = '';
@@ -475,12 +475,21 @@ function wfDebugDieBacktrace( $msg = '' ) {
                }
                $backtrace = debug_backtrace();
                foreach( $backtrace as $call ) {
-                       $f = explode( DIRECTORY_SEPARATOR, $call['file'] );
-                       $file = $f[count($f)-1];
+                       if( isset( $call['file'] ) ) {
+                               $f = explode( DIRECTORY_SEPARATOR, $call['file'] );
+                               $file = $f[count($f)-1];
+                       } else {
+                               $file = '-';
+                       }
+                       if( isset( $call['line'] ) ) {
+                               $line = $call['line'];
+                       } else {
+                               $line = '-';
+                       }
                        if ( $wgCommandLineMode ) {
-                               $msg .= "$file line {$call['line']} calls ";
+                               $msg .= "$file line $line calls ";
                        } else {
-                               $msg .= '<li>' . $file . ' line ' . $call['line'] . ' calls ';
+                               $msg .= '<li>' . $file . ' line ' . $line . ' calls ';
                        }
                        if( !empty( $call['class'] ) ) $msg .= $call['class'] . '::';
                        $msg .= $call['function'] . '()';
@@ -616,7 +625,7 @@ function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
  */
 function wfEscapeWikiText( $text ) {
        $text = str_replace( 
-               array( '[',             '|',      "'",     'ISBN '        , '://'         , "\n=", '{{' ),
+               array( '[',             '|',      '\'',    'ISBN '        , '://'         , "\n=", '{{' ),
                array( '&#91;', '&#124;', '&#39;', 'ISBN&#32;', '&#58;//' , "\n&#61;", '&#123;&#123;' ),
                htmlspecialchars($text) );
        return $text;
@@ -803,7 +812,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
  */
 function wfVarDump( $var ) {
        global $wgOut;
-       $s = str_replace("\n","<br>\n", var_export( $var, true ) . "\n");
+       $s = str_replace("\n","<br />\n", var_export( $var, true ) . "\n");
        if ( headers_sent() || !@is_object( $wgOut ) ) {
                print $s;
        } else {
@@ -824,7 +833,7 @@ function wfHttpError( $code, $label, $desc ) {
        # Don't send content if it's a HEAD request.
        if( $_SERVER['REQUEST_METHOD'] == 'HEAD' ) {
                header( 'Content-type: text/plain' );
-               print "$desc\n";
+               print $desc."\n";
        }
 }
 
@@ -1017,6 +1026,10 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) {
        } elseif (preg_match("/^(\d{1,13})$/",$ts,$datearray)) {
                # TS_UNIX
                $uts=$ts;
+       } else {
+               # Bogus value; fall back to the epoch...
+               wfDebug("wfTimestamp() given bogus time value.\n");
+               $uts = 0;
        }
 
        if ($ts==0)
@@ -1029,9 +1042,9 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) {
        case TS_DB:
                return gmdate( 'Y-m-d H:i:s', $uts );
        case TS_RFC2822:
-               return gmdate( "D, j M Y H:i:s", $uts ) . ' GMT';
+               return gmdate( 'D, d M Y H:i:s', $uts ) . ' GMT';
        default:
-               return;
+               wfDebugDieBacktrace( 'wfTimestamp() called with illegal output type.');
        }
 }