diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-11-07 00:59:59 +0400 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-11-09 01:38:04 +0400 |
| commit | 7d246ab638f2e81ff4833938626468e96ea210b5 (patch) | |
| tree | dca41540b59d80cc173f805c986a2b990f64204c /lib/helper.php | |
| parent | 3a5298287bc1730ce5bfca2f2b359c9285afd028 (diff) | |
Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley
Remove obsolete method
Dont count '.' and '..' as directories when importing.
Diffstat (limited to 'lib/helper.php')
| -rw-r--r-- | lib/helper.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/helper.php b/lib/helper.php index 080df8613ec..f2698ffbccd 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -309,7 +309,8 @@ class OC_Helper { self::copyr("$src/$file", "$dest/$file"); } } - }elseif(file_exists($src)){ + + }elseif(file_exists($src) && !OC_Filesystem::isFileBlacklisted($src)) { copy($src, $dest); } } |