Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #371 from daylerees/patch-1 

Allow File::cpdir() to return false on failure.
This commit is contained in:
Taylor Otwell 2012-03-21 08:57:38 -07:00
parent 41e066e2ee 2c4d35e6a4
commit ea8d80d67d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/file.php
View File

@ -183,7 +183,7 @@ public static function is($extensions, $path)
*/
public static function mvdir($source, $destination, $options = fIterator::SKIP_DOTS)
{
static::cpdir($source, $destination, true, $options);
return static::cpdir($source, $destination, true, $options);
}
/**
@ -197,7 +197,7 @@ public static function mvdir($source, $destination, $options = fIterator::SKIP_D
*/
public static function cpdir($source, $destination, $delete = false, $options = fIterator::SKIP_DOTS)
{
if ( ! is_dir($source)) return;
if ( ! is_dir($source)) return false;
// First we need to create the destination directory if it doesn't
// already exists. This directory hosts all of the assets we copy
@ -221,7 +221,7 @@ public static function cpdir($source, $destination, $delete = false, $options =
{
$path = $item->getRealPath();
static::cpdir($path, $location, $delete, $options);
if (! static::cpdir($path, $location, $delete, $options)) return false;
if ($delete) @rmdir($item->getRealPath());
}
@ -231,13 +231,15 @@ public static function cpdir($source, $destination, $delete = false, $options =
// files with the same name.
else
{
copy($item->getRealPath(), $location);
if(! copy($item->getRealPath(), $location)) return false;
if ($delete) @unlink($item->getRealPath());
}
}
if ($delete) rmdir($source);
return true;
}
/**