Commit 3670423d authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #558 from ProgerXP/patch-locks-dev

Fixing "Cannot remove ...: Permission denied" in File and bundle:: task
parents 45c9d154 5db37437
...@@ -54,6 +54,7 @@ abstract class Provider { ...@@ -54,6 +54,7 @@ abstract class Provider {
File::rmdir($work.'zip'); File::rmdir($work.'zip');
$zip->close();
@unlink($target); @unlink($target);
} }
......
...@@ -94,7 +94,7 @@ class File { ...@@ -94,7 +94,7 @@ class File {
/** /**
* Extract the file extension from a file path. * Extract the file extension from a file path.
* *
* @param string $path * @param string $path
* @return string * @return string
*/ */
...@@ -273,8 +273,9 @@ class File { ...@@ -273,8 +273,9 @@ class File {
} }
} }
if ($delete) rmdir($source); unset($items);
if ($delete) @rmdir($source);
return true; return true;
} }
...@@ -306,6 +307,7 @@ class File { ...@@ -306,6 +307,7 @@ class File {
} }
} }
unset($items);
if ( ! $preserve) @rmdir($directory); if ( ! $preserve) @rmdir($directory);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment