summaryrefslogtreecommitdiffstats
path: root/lib/helper.php
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2012-11-06 20:59:59 +0000
committerTom Needham <needham.thomas@gmail.com>2012-11-08 11:37:27 +0000
commit0833be9d4eacdfd712b9a52ab4545effb64f790a (patch)
tree72a3b2b7c0d1947955a1085d00402ba062464814 /lib/helper.php
parentfbc3123d8e599ee5ae4a574856d93e4603aba843 (diff)
downloadnextcloud-server-0833be9d4eacdfd712b9a52ab4545effb64f790a.tar.gz
nextcloud-server-0833be9d4eacdfd712b9a52ab4545effb64f790a.zip
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.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/helper.php b/lib/helper.php
index ed459dab624..ccceb58cd4c 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -319,7 +319,7 @@ class OC_Helper {
self::copyr("$src/$file", "$dest/$file");
}
}
- }elseif(file_exists($src)) {
+ }elseif(file_exists($src) && !OC_Filesystem::isFileBlacklisted($src)) {
copy($src, $dest);
}
}