diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:42:37 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:42:37 +0200 |
| commit | 82cbbb8ab8cfe81559c45905d7fca819d71df346 (patch) | |
| tree | 947d58076dae8d5c4d0bd001ccebbe079448e057 /lib/archive.php | |
| parent | 1558cb860c2fb26fdde14fce2a16acbb29d12b3e (diff) | |
| parent | 46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff) | |
| download | nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.tar.gz nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.zip | |
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
apps/files/index.php
Diffstat (limited to 'lib/archive.php')
| -rw-r--r-- | lib/archive.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/archive.php b/lib/archive.php index 364cd5a74a1..85bfae57295 100644 --- a/lib/archive.php +++ b/lib/archive.php @@ -119,7 +119,8 @@ abstract class OC_Archive{ * @return bool */ function addRecursive($path, $source) { - if($dh=opendir($source)) { + $dh = opendir($source); + if(is_resource($dh)) { $this->addFolder($path); while (($file = readdir($dh)) !== false) { if($file=='.' or $file=='..') { |