[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21404-g9db5e44

[Marc Delisle]

The branch, master has been updated
       via  9db5e4447c9249a92ca3283d452513c10d79a380 (commit)
       via  c76d9fea3a64a06fdd2d2bd215f97932ce2f7282 (commit)
       via  ec99ab3e0084e61623f5343dc82296cc0cd5fe3b (commit)
      from  00269e5e5e5249018bd08576571ab46e87677de7 (commit)


- Log -----------------------------------------------------------------
commit 9db5e4447c9249a92ca3283d452513c10d79a380
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 19 13:21:42 2011 -0400

    Fix merge conflicts

commit c76d9fea3a64a06fdd2d2bd215f97932ce2f7282
Merge: 00269e5 ec99ab3
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 19 13:15:05 2011 -0400

    Merge branch 'QA_3_4'

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

Summary of changes:
 ChangeLog  |    1 +
 export.php |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25041cf..9e266b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,7 @@ phpMyAdmin - ChangeLog
 - bug #3423725 [pdf] Broken PDF file when exporting database to PDF
 - [core] Allow to set language in URL
 - bug #3425184 [doc] Fix links to PHP documentation
+- bug #3426031 [export] Export to bzip2 is not working
 
 3.4.6.0 (2011-10-16)
 - patch #3404173 InnoDB comment display with tooltips/aliases
diff --git a/export.php b/export.php
index 0c8a644..ba3d883 100644
--- a/export.php
+++ b/export.php
@@ -35,7 +35,7 @@ if (! isset($export_list[$type])) {
 $compression_methods = array(
     'zip',
     'gzip',
-    'bzip',
+    'bzip2',
 );
 
 /**
@@ -153,7 +153,7 @@ function PMA_exportOutputHandler($line)
                     $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer);
                 }
                 // as bzipped
-                if ($GLOBALS['compression'] == 'bzip'  && @function_exists('bzcompress')) {
+                if ($GLOBALS['compression'] == 'bzip2'  && @function_exists('bzcompress')) {
                     $dump_buffer = bzcompress($dump_buffer);
                 } elseif ($GLOBALS['compression'] == 'gzip' && @function_exists('gzencode')) {
                     // as a gzipped file
@@ -224,7 +224,7 @@ $output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_C
     && $type != 'xls';
 
 // Use on the fly compression?
-$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip');
+$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip2');
 if ($onfly_compression) {
     $memory_limit = trim(@ini_get('memory_limit'));
     // 2 MB as default
@@ -287,7 +287,7 @@ if ($asfile) {
 
     // If dump is going to be compressed, set correct mime_type and add
     // compression to extension
-    if ($compression == 'bzip') {
+    if ($compression == 'bzip2') {
         $filename  .= '.bz2';
         $mime_type = 'application/x-bzip2';
     } elseif ($compression == 'gzip') {
@@ -631,7 +631,7 @@ if (!empty($asfile)) {
             $zipfile -> addFile($dump_buffer, substr($filename, 0, -4));
             $dump_buffer = $zipfile -> file();
         }
-    } elseif ($compression == 'bzip') {
+    } elseif ($compression == 'bzip2') {
         // 2. as a bzipped file
         if (@function_exists('bzcompress')) {
             $dump_buffer = bzcompress($dump_buffer);


hooks/post-receive
-- 
phpMyAdmin