From 1f02ff0a22f84b581b048974b132ec9859cefbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sun, 19 Nov 2006 20:57:22 +0000
Subject: [PATCH] Fix check for encrypted file (bug #1596304).

---
 ChangeLog               | 3 +++
 libraries/unzip.lib.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 25c25bb6d..6ab596d6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-11-19 Michal Čihař  <michal@cihar.com>
+    * libraries/unzip.lib.php: Fix check for encrypted file (bug #1596304).
+
 2006-11-19 Marc Delisle  <lem9@users.sourceforge.net>
     * scripts/upgrade.pl: bug #1599173, adapt for new filename structure,
       thanks to Linas Gricius
diff --git a/libraries/unzip.lib.php b/libraries/unzip.lib.php
index df3264f49..1a0b5731a 100644
--- a/libraries/unzip.lib.php
+++ b/libraries/unzip.lib.php
@@ -278,7 +278,7 @@
                 // Retrieving local file header information
                 $aP = unpack('v1VN/v1GPF/v1CM/v1FT/v1FD/V1CRC/V1CS/V1UCS/v1FNL', $vZ);
                 // Check if data is encrypted
-                $bE = ($aP['GPF'] && 0x0001) ? TRUE : FALSE;
+                $bE = ($aP['GPF'] & 0x0001) ? TRUE : FALSE;
                 $nF = $aP['FNL'];
 
                 // Special case : value block after the compressed data