merge from luminous (11139-12038)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12040 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-02 07:20:00 +00:00
commit 86011ab063
23 changed files with 126 additions and 49 deletions

View file

@ -27,7 +27,8 @@
(defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false &&
function_exists('ob_gzhandler') &&
extension_loaded('zlib')
extension_loaded('zlib') &&
$oModule->gzhandler_enable
) $this->gz_enabled = true;
// Extract contents to display by the request method
if(Context::get('xeVirtualRequestMethod')=='xml') {