diff options
| author | Remi Collet <remi@php.net> | 2015-09-07 13:55:19 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-09-07 13:55:19 +0200 |
| commit | a5d6cf788ea9554cb7dc0b53ab84fc614048e98d (patch) | |
| tree | 7e33f6bb6807b13b18dde7b5f8f34e0746a5943c | |
| parent | aa352a34fd1077995ec159ba30a6cf62c70e64c7 (diff) | |
| parent | debfc866d2971c69d4f47662fb4bb70feb0c0007 (diff) | |
| download | php-git-a5d6cf788ea9554cb7dc0b53ab84fc614048e98d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix build
| -rw-r--r-- | ext/zip/php_zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 99adb723e3..f68534c48d 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1505,8 +1505,8 @@ static ZIPARCHIVE_METHOD(close) ze_obj = Z_ZIP_P(self); - if (err = zip_close(intern)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, zip_strerror(intern)); + if ((err = zip_close(intern))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zip_strerror(intern)); zip_discard(intern); } |