diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-04-05 15:33:17 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-04-05 15:33:17 +0200 |
| commit | bd438890ccde1cfe3cb902e52ea7b2eee7a99f3f (patch) | |
| tree | 77f28a8e96a7edc1c9219b85e30ea991391eec4c /system | |
| parent | e36d048b068418b76551fb9eaa2c32a7b40f3812 (diff) | |
| parent | b7a8fbb9588ce4603e9c8fa16072a186e70b8bdb (diff) | |
Merge pull request #3730 from paralogizing/develop
Consistent DIRECTORY_SEPARATOR usage in Zip::read_dir()
Diffstat (limited to 'system')
| -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))) |