[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-9108-g0d4ccd0

[Michal Čihař]

The branch, master has been updated
       via  0d4ccd012d3c8046eceb2a5019cdba7754bdbaae (commit)
      from  2e2b123d9c7d3f474f376da5b195928716ce2108 (commit)


- Log -----------------------------------------------------------------
commit 0d4ccd012d3c8046eceb2a5019cdba7754bdbaae
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Jul 18 10:06:31 2011 +0200

    Use old_offset instead of strlen
    
    It is really not needed to use real data as we have the offset stored
    anyway.

-----------------------------------------------------------------------

Summary of changes:
 libraries/zip.lib.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php
index 443b173..672b00a 100644
--- a/libraries/zip.lib.php
+++ b/libraries/zip.lib.php
@@ -205,7 +205,7 @@ class zipfile
             pack('v', sizeof($this -> ctrl_dir)) .  // total # of entries "on this disk"
             pack('v', sizeof($this -> ctrl_dir)) .  // total # of entries overall
             pack('V', strlen($ctrldir)) .           // size of central dir
-            pack('V', strlen($data)) .              // offset to start of central dir
+            pack('V', $this -> old_offset) .        // offset to start of central dir
             "\x00\x00";                             // .zip file comment length
 
         if ( $this -> doWrite ) {       // Send central directory & end ctrl dir to STDOUT


hooks/post-receive
-- 
phpMyAdmin