X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=513f59346c8c8fdc121b9f1b3726008380698bcf;hb=719387f2e27ddc87205ac151c8337d97b63ae8fd;hp=7a5a5d8489cf80588b35aefb004f8b670e8ce95f;hpb=f5cd97efc7b6706b3adff737d6ca55c084729277;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 7a5a5d8489..513f59346c 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1845,7 +1845,7 @@ function wfHttpError( $code, $label, $desc ) { function wfResetOutputBuffers( $resetGzipEncoding = true ) { if ( $resetGzipEncoding ) { // Suppress Content-Encoding and Content-Length - // headers from 1.10+s wfOutputHandler + // headers from OutputHandler::handle. global $wgDisableOutputCompression; $wgDisableOutputCompression = true; } @@ -3019,7 +3019,7 @@ function wfWaitForSlaves( $ifWritesSince = null, $wiki = false, $cluster = false, $timeout = null ) { if ( $timeout === null ) { - $timeout = wfIsCLI() ? 86400 : 10; + $timeout = wfIsCLI() ? 60 : 10; } if ( $cluster === '*' ) {