diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:25:14 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:25:14 +0200 |
| commit | 250c04c8d5f7e7ee142bcdd2992abbc37b00654c (patch) | |
| tree | 28b203a50ac2732952e31cc86713524cff558bb5 /phpBB/includes | |
| parent | dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c (diff) | |
| parent | 3cbcff56b20d384c92bbf9a627a8878a364e0597 (diff) | |
| download | forums-250c04c8d5f7e7ee142bcdd2992abbc37b00654c.tar forums-250c04c8d5f7e7ee142bcdd2992abbc37b00654c.tar.gz forums-250c04c8d5f7e7ee142bcdd2992abbc37b00654c.tar.bz2 forums-250c04c8d5f7e7ee142bcdd2992abbc37b00654c.tar.xz forums-250c04c8d5f7e7ee142bcdd2992abbc37b00654c.zip | |
Merge branch 'ticket/nickvergessen/7296' into develop-olympus
* ticket/nickvergessen/7296:
[ticket/7296] Exporting styles to tar creates corrupted archives.
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 276e3008cc..2ccc728031 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) { |