summaryrefslogtreecommitdiffstats
path: root/system/libraries/Zip.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-04-04 14:29:14 +0200
committerAndrey Andreev <narf@bofh.bg>2012-04-04 14:29:14 +0200
commit449340b863dbf11e68dfbeac905b268003733f01 (patch)
tree8c9c530ce836d89a445d2957516fe8dbcd66f6a8 /system/libraries/Zip.php
parentc8709839a57feb991a1fef527afecd1b07f12f0f (diff)
parent9664cc9fbb9b7f10776e9ad76ba7b27de5c2cda4 (diff)
Merge pull request #1242 from tschechniker/patch-1
Added Windows path compatibility to function CI_Zip::read_dir()
Diffstat (limited to 'system/libraries/Zip.php')
-rw-r--r--system/libraries/Zip.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e91e2a2ff..80438546b 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -279,7 +279,7 @@ class CI_Zip {
*/
public function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
{
- $path = rtrim($path, '/\\').'/';
+ $path = rtrim($path, '/\\').DIRECTORY_SEPARATOR;
if ( ! $fp = @opendir($path))
{
return FALSE;
@@ -288,7 +288,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).'/';
+ $root_path = dirname($path).DIRECTORY_SEPARATOR;
}
while (FALSE !== ($file = readdir($fp)))
@@ -300,11 +300,11 @@ class CI_Zip {
if (@is_dir($path.$file))
{
- $this->read_dir($path.$file.'/', $preserve_filepath, $root_path);
+ $this->read_dir($path.$file.DIRECTORY_SEPARATOR, $preserve_filepath, $root_path);
}
elseif (FALSE !== ($data = file_get_contents($path.$file)))
{
- $name = str_replace('\\', '/', $path);
+ $name = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $path);
if ($preserve_filepath === FALSE)
{
$name = str_replace($root_path, '', $name);