typo

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 567954b..31b72a7 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -302,7 +302,7 @@ function logProfilingData() {
                        $forward .= ' from ' . $_SERVER['HTTP_FROM'];
                if( $forward )
                        $forward = "\t(proxied via {$_SERVER['REMOTE_ADDR']}{$forward})";
-               if($wgUser->getId() == 0)
+               if( $wgUser->isAnon() )
                        $forward .= ' anon';
                $log = sprintf( "%s\t%04.3f\t%s\n",
                  gmdate( 'YmdHis' ), $elapsed,
@@ -625,7 +625,7 @@ function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
  */
 function wfEscapeWikiText( $text ) {
        $text = str_replace( 
-               array( '[',             '|',      "'",     'ISBN '        , '://'         , "\n=", '{{' ),
+               array( '[',             '|',      '\'',    'ISBN '        , '://'         , "\n=", '{{' ),
                array( '[', '|', ''', 'ISBN ', '://' , "\n=", '{{' ),
                htmlspecialchars($text) );
        return $text;
@@ -783,7 +783,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
          wfEscapeShellArg( $yourtextName );
        $handle = popen( $cmd, 'r' );
 
-       if( fgets( $handle ) ){
+       if( fgets( $handle, 1024 ) ){
                $conflict = true;
        } else {
                $conflict = false;
@@ -833,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";
        }
 }
 
@@ -960,17 +960,6 @@ function wfTimestampNow() {
        return wfTimestamp( TS_MW, time() );
 }
 
-/**
- * Sorting hack for MySQL 3, which doesn't use index sorts for DESC
- */
-function wfInvertTimestamp( $ts ) {
-       return strtr(
-               $ts,
-               '0123456789',
-               '9876543210'
-       );
-}
-
 /**
  * Reference-counted warning suppression
  */
@@ -1042,7 +1031,7 @@ 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, d M Y H:i:s", $uts ) . ' GMT';
+               return gmdate( 'D, d M Y H:i:s', $uts ) . ' GMT';
        default:
                wfDebugDieBacktrace( 'wfTimestamp() called with illegal output type.');
        }
@@ -1062,4 +1051,37 @@ function wfIsWindows() {
        }   
 } 
 
+/**
+ * Swap two variables
+ */
+function swap( &$x, &$y ) {
+       $z = $x;
+       $x = $y;
+       $y = $z;
+}
+
+function wfGetSiteNotice() {
+       global $wgSiteNotice, $wgTitle, $wgOut;
+       $fname = 'wfGetSiteNotice';
+       wfProfileIn( $fname );
+
+       $notice = wfMsg( 'sitenotice' );
+       if($notice == '<sitenotice>') $notice = '';
+       # Allow individual wikis to turn it off
+       if ( $notice == '-' ) {
+               $notice = '';
+       } else {
+               if ($notice == '') {
+                       $notice = $wgSiteNotice;
+               }
+               if($notice != '-' && $notice != '') {
+                       $specialparser = new Parser();
+                       $parserOutput = $specialparser->parse( $notice, $wgTitle, $wgOut->mParserOptions, false );
+                       $notice = $parserOutput->getText();
+               }
+       }
+       wfProfileOut( $fname );
+       return $notice;
+}
+
 ?>