diff options
author | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
---|---|---|
committer | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
commit | b587698dd45396b91106bd7c894a79747b1fb7a9 (patch) | |
tree | 76a1d614976dd0b695e513a40f9235e3b9f7f82c /system/libraries/Zip.php | |
parent | 9b9a06c9635cd3b4fce0aebe4d2eead4809999a5 (diff) | |
parent | fd363f224d7886eb686434d7a835eaa49183d8e6 (diff) |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
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 f2f17148b..3e98ac568 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -352,7 +352,7 @@ class CI_Zip { // Set the original directory root for child dir's to use as relative if ($root_path === NULL) { - $root_path = dirname($path).DIRECTORY_SEPARATOR; + $root_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, dirname($path)).DIRECTORY_SEPARATOR; } while (FALSE !== ($file = readdir($fp))) |