diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-07 14:35:51 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-07 14:35:51 +0100 |
| commit | ff6d1a80b75eb4303551be1f2708509757a85e50 (patch) | |
| tree | c84c6a397341c462f02aa236d2c406944ff20386 /system/libraries/Zip.php | |
| parent | 664b83e1d023e067d3b9bc75dbe96161236fd5f7 (diff) | |
| parent | c697a3bfdfc301718058a09fd5692fbecee6920a (diff) | |
Merge branch 'develop' into 'feature/user-guide-cleanup'
Diffstat (limited to 'system/libraries/Zip.php')
| -rw-r--r-- | system/libraries/Zip.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index b10b0bb0f..58f06455c 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -294,7 +294,7 @@ class CI_Zip { { $name = str_replace('\\', '/', $path); - if ($preserve_filepath === FALSE) + if ($archive_filepath === FALSE) { $name = preg_replace('|.*/(.+)|', '\\1', $name); } |