diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-08 17:32:00 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-08 17:32:00 +0100 |
| commit | 091ff023623a4f24257c4e5dbd17ffcb607c649a (patch) | |
| tree | 8489518f0817170439e609bfdc351eca181a90ab /lib/helper.php | |
| parent | 961ff01a93dd69cb12196a1b8507cce925e74fbc (diff) | |
| parent | 2d523656066ca3c917c43dd3c6f794148d0a2841 (diff) | |
| download | nextcloud-server-091ff023623a4f24257c4e5dbd17ffcb607c649a.tar.gz nextcloud-server-091ff023623a4f24257c4e5dbd17ffcb607c649a.zip | |
merge master into filesystem
Diffstat (limited to 'lib/helper.php')
| -rw-r--r-- | lib/helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/helper.php b/lib/helper.php index eab63599120..a7fa7be8738 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); } } |