Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3079fba..623f9d3 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -189,11 +189,12 @@ function wfDebug( $text, $logonly = false ) {
  *                     log file is specified, (default true)
  */
 function wfDebugLog( $logGroup, $text, $public = true ) {
-       global $wgDebugLogGroups, $wgDBname;
+       global $wgDebugLogGroups;
        if( $text{strlen( $text ) - 1} != "\n" ) $text .= "\n";
        if( isset( $wgDebugLogGroups[$logGroup] ) ) {
                $time = wfTimestamp( TS_DB );
-               @error_log( "$time $wgDBname: $text", 3, $wgDebugLogGroups[$logGroup] );
+               $wiki = wfWikiID();
+               @error_log( "$time $wiki: $text", 3, $wgDebugLogGroups[$logGroup] );
        } else if ( $public === true ) {
                wfDebug( $text, true );
        }
@@ -1377,7 +1378,7 @@ function swap( &$x, &$y ) {
 }
 
 function wfGetCachedNotice( $name ) {
-       global $wgOut, $parserMemc, $wgDBname;
+       global $wgOut, $parserMemc;
        $fname = 'wfGetCachedNotice';
        wfProfileIn( $fname );
        
@@ -1388,7 +1389,7 @@ function wfGetCachedNotice( $name ) {
                return( false );
        }
        
-       $cachedNotice = $parserMemc->get( $wgDBname . ':' . $name );
+       $cachedNotice = $parserMemc->get( wfMemcKey( $name ) );
        if( is_array( $cachedNotice ) ) {
                if( md5( $notice ) == $cachedNotice['hash'] ) {
                        $notice = $cachedNotice['html'];
@@ -1402,7 +1403,7 @@ function wfGetCachedNotice( $name ) {
        if( $needParse ) {
                if( is_object( $wgOut ) ) {
                        $parsed = $wgOut->parse( $notice );
-                       $parserMemc->set( $wgDBname . ':' . $name, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+                       $parserMemc->set( wfMemcKey( $name ), array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
                        $notice = $parsed;
                } else {
                        wfDebug( 'wfGetCachedNotice called for ' . $name . ' with no $wgOut available' );
@@ -1462,37 +1463,14 @@ function wfGetSiteNotice() {
        return $siteNotice;
 }
 
-/** Global singleton instance of MimeMagic. This is initialized on demand,
-* please always use the wfGetMimeMagic() function to get the instance.
-*
-* @private
-*/
-$wgMimeMagic= NULL;
-
-/** Factory functions for the global MimeMagic object.
-* This function always returns the same singleton instance of MimeMagic.
-* That objects will be instantiated on the first call to this function.
-* If needed, the MimeMagic.php file is automatically included by this function.
-* @return MimeMagic the global MimeMagic objects.
-*/
+/** 
+ * BC wrapper for MimeMagic::singleton()
+ * @deprecated
+ */
 function &wfGetMimeMagic() {
-       global $wgMimeMagic;
-
-       if (!is_null($wgMimeMagic)) {
-               return $wgMimeMagic;
-       }
-
-       if (!class_exists("MimeMagic")) {
-               #include on demand
-               require_once("MimeMagic.php");
-       }
-
-       $wgMimeMagic= new MimeMagic();
-
-       return $wgMimeMagic;
+       return MimeMagic::singleton();
 }
 
-
 /**
  * Tries to get the system directory for temporary files.
  * The TMPDIR, TMP, and TEMP environment variables are checked in sequence,
@@ -1564,8 +1542,8 @@ function wfMkdirParents( $fullDir, $mode = 0777 ) {
  * Increment a statistics counter
  */
  function wfIncrStats( $key ) {
-        global $wgDBname, $wgMemc;
-        $key = "$wgDBname:stats:$key";
+        global $wgMemc;
+        $key = wfMemcKey( 'stats', $key );
         if ( is_null( $wgMemc->incr( $key ) ) ) {
                 $wgMemc->add( $key, 1 );
         }
@@ -1671,7 +1649,7 @@ function wfUrlProtocols() {
  * @return collected stdout as a string (trailing newlines stripped)
  */
 function wfShellExec( $cmd, &$retval=null ) {
-       global $IP, $wgMaxShellMemory;
+       global $IP, $wgMaxShellMemory, $wgMaxShellFileSize;
        
        if( ini_get( 'safe_mode' ) ) {
                wfDebug( "wfShellExec can't run in safe_mode, PHP's exec functions are too broken.\n" );
@@ -1682,11 +1660,12 @@ function wfShellExec( $cmd, &$retval=null ) {
        if ( php_uname( 's' ) == 'Linux' ) {
                $time = ini_get( 'max_execution_time' );
                $mem = intval( $wgMaxShellMemory );
+               $filesize = intval( $wgMaxShellFileSize );
 
                if ( $time > 0 && $mem > 0 ) {
-                       $script = "$IP/bin/ulimit.sh";
+                       $script = "$IP/bin/ulimit-tvf.sh";
                        if ( is_executable( $script ) ) {
-                               $cmd = escapeshellarg( $script ) . " $time $mem $cmd";
+                               $cmd = escapeshellarg( $script ) . " $time $mem $filesize $cmd";
                        }
                }
        } elseif ( php_uname( 's' ) == 'Windows NT' ) {
@@ -2044,4 +2023,44 @@ function wfGetAllCallers() {
                array_reverse(debug_backtrace())));
 }
 
+/**
+ * Get a cache key
+ */
+function wfMemcKey( /*... */ ) {
+       global $wgDBprefix, $wgDBname;
+       $args = func_get_args();
+       if ( $wgDBprefix ) {
+               $key = "$wgDBname-$wgDBprefix:" . implode( ':', $args );
+       } else {
+               $key = $wgDBname . ':' . implode( ':', $args );
+       }
+       return $key;
+}
+
+/**
+ * Get a cache key for a foreign DB
+ */
+function wfForeignMemcKey( $db, $prefix /*, ... */ ) {
+       $args = array_slice( func_get_args(), 2 );
+       if ( $prefix ) {
+               $key = "$db-$prefix:" . implode( ':', $args );
+       } else {
+               $key = $db . ':' . implode( ':', $args );
+       }
+       return $key;
+}
+
+/**
+ * Get an ASCII string identifying this wiki
+ * This is used as a prefix in memcached keys
+ */
+function wfWikiID() {
+       global $wgDBprefix, $wgDBname;
+       if ( $wgDBprefix ) {
+               return "$wgDBname-$wgDBprefix";
+       } else {
+               return $wgDBname;
+       }
+}
+
 ?>