diff options
| author | Marc Delisle <marc@infomarc.info> | 2011-10-19 21:21:42 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2011-10-19 21:21:42 +0400 |
| commit | 9db5e4447c9249a92ca3283d452513c10d79a380 (patch) | |
| tree | 442a08878e803b8d10c95f4e375ab369311b5514 /export.php | |
| parent | c76d9fea3a64a06fdd2d2bd215f97932ce2f7282 (diff) | |
Fix merge conflicts
Diffstat (limited to 'export.php')
| -rw-r--r-- | export.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/export.php b/export.php index 5eca2256e9..ba3d883d87 100644 --- a/export.php +++ b/export.php @@ -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); |