diff options
| author | Remi Collet <remi@php.net> | 2013-12-30 07:35:30 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-12-30 07:35:30 +0100 |
| commit | 0a950a05005f94e56bd2a42b99a0961db86952db (patch) | |
| tree | 3949553a3f889947795b007df4776643b153da55 /ext/zip/lib/zip_extra_field.c | |
| parent | 5a756afcf14fada75f6ed8052cd97924dd229ed8 (diff) | |
| download | php-git-0a950a05005f94e56bd2a42b99a0961db86952db.tar.gz | |
Sync with pecl/zip 1.12.4dev
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
with new methods:
ZipArchive::setExternalAttributesName
ZipArchive::setExternalAttributesIndex
ZipArchive::getExternalAttributesName
ZipArchive::getExternalAttributesIndex
Diffstat (limited to 'ext/zip/lib/zip_extra_field.c')
| -rw-r--r-- | ext/zip/lib/zip_extra_field.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/lib/zip_extra_field.c b/ext/zip/lib/zip_extra_field.c index 41fd2b1d90..8f1ccaa235 100644 --- a/ext/zip/lib/zip_extra_field.c +++ b/ext/zip/lib/zip_extra_field.c @@ -78,7 +78,7 @@ _zip_ef_delete_by_id(struct zip_extra_field *ef, zip_uint16_t id, zip_uint16_t i head = ef; prev = NULL; for (; ef; ef=(prev ? prev->next : head)) { - if ((ef->flags & flags & ZIP_EF_BOTH) && ef->id == id) { + if ((ef->flags & flags & ZIP_EF_BOTH) && ((ef->id == id) || (id == ZIP_EXTRA_FIELD_ALL))) { if (id_idx == ZIP_EXTRA_FIELD_ALL || i == id_idx) { ef->flags &= ~(flags & ZIP_EF_BOTH); if ((ef->flags & ZIP_EF_BOTH) == 0) { |