diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
tree | f7846203a952e38aaf66989d0a4702779f549962 /includes/OutputHandler.php | |
parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/OutputHandler.php')
-rw-r--r-- | includes/OutputHandler.php | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php index 4112f8a2..46a43f63 100644 --- a/includes/OutputHandler.php +++ b/includes/OutputHandler.php @@ -1,6 +1,21 @@ <?php /** - * Functions to be used with PHP's output buffer + * Functions to be used with PHP's output buffer. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html * * @file */ @@ -76,7 +91,12 @@ function wfRequestExtension() { * @return string */ function wfGzipHandler( $s ) { - if( !function_exists( 'gzencode' ) || headers_sent() ) { + if( !function_exists( 'gzencode' ) ) { + wfDebug( __FUNCTION__ . "() skipping compression (gzencode unavaible)\n" ); + return $s; + } + if( headers_sent() ) { + wfDebug( __FUNCTION__ . "() skipping compression (headers already sent)\n" ); return $s; } @@ -90,6 +110,7 @@ function wfGzipHandler( $s ) { } if( wfClientAcceptsGzip() ) { + wfDebug( __FUNCTION__ . "() is compressing output\n" ); header( 'Content-Encoding: gzip' ); $s = gzencode( $s, 6 ); } |