[Fmsystem-commits] [6568] merge 6566:6567 from trunk

[Sigurd Nes]

Revision: 6568
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6568
Author:   sigurdne
Date:     2010-11-10 10:09:56 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
merge 6566:6567 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/phpgwapi/inc/combine.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567

Modified: branches/Version-1_0-branch/phpgwapi/inc/combine.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/combine.php        2010-11-10 
10:09:10 UTC (rev 6567)
+++ branches/Version-1_0-branch/phpgwapi/inc/combine.php        2010-11-10 
10:09:56 UTC (rev 6568)
@@ -86,8 +86,8 @@
                if ($cache)
                {
                        // Determine supported compression method
-                       $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 
'gzip');
-                       $deflate = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 
'deflate');
+                       $gzip = isset($_SERVER['HTTP_ACCEPT_ENCODING']) && 
$_SERVER['HTTP_ACCEPT_ENCODING'] ? strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 
'gzip') : '';
+                       $deflate = isset($_SERVER['HTTP_ACCEPT_ENCODING']) && 
$_SERVER['HTTP_ACCEPT_ENCODING'] ? strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 
'deflate') : '';
 
                        // Determine used compression method
                        $encoding = $gzip ? 'gzip' : ($deflate ? 'deflate' : 
'none');