diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-08-22 11:16:19 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2010-08-22 11:16:19 -0400 |
| commit | 3cbcff56b20d384c92bbf9a627a8878a364e0597 (patch) | |
| tree | 554ac416152ca2c86cbd80d316bb68055d18b38e /phpBB/includes | |
| parent | 25c579c00d25356afead09f13031e69e22f91324 (diff) | |
| download | forums-3cbcff56b20d384c92bbf9a627a8878a364e0597.tar forums-3cbcff56b20d384c92bbf9a627a8878a364e0597.tar.gz forums-3cbcff56b20d384c92bbf9a627a8878a364e0597.tar.bz2 forums-3cbcff56b20d384c92bbf9a627a8878a364e0597.tar.xz forums-3cbcff56b20d384c92bbf9a627a8878a364e0597.zip | |
[ticket/7296] Exporting styles to tar creates corrupted archives.
Add the folders to the archive before putting the files inside, seems to break
the tar-archives.
PHPBB3-7296
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions_compress.php | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 3310560c73..0b4cf2a024 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -2040,23 +2040,18 @@ parse_css_file = {PARSE_CSS_FILE} { case 'tar': $ext = '.tar'; - $mimetype = 'x-tar'; - $compress = 'compress_tar'; break; case 'zip': $ext = '.zip'; - $mimetype = 'zip'; break; case 'tar.gz': $ext = '.tar.gz'; - $mimetype = 'x-gzip'; break; case 'tar.bz2': $ext = '.tar.bz2'; - $mimetype = 'x-bzip2'; break; default: diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index f422eaa8c1..455debd939 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -53,13 +53,18 @@ class compress $filelist = filelist("$phpbb_root_path$src", '', '*'); krsort($filelist); + /** + * Commented out, as adding the folders produces corrupted archives if ($src_path) { $this->data($src_path, '', true, stat("$phpbb_root_path$src")); } + */ foreach ($filelist as $path => $file_ary) { + /** + * Commented out, as adding the folders produces corrupted archives if ($path) { // Same as for src_path @@ -68,6 +73,7 @@ class compress $this->data("$src_path$path", '', true, stat("$phpbb_root_path$src$path")); } + */ foreach ($file_ary as $file) { |