diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-23 11:34:23 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-23 11:34:23 +0200 |
| commit | bcdb3c26da28e3797833da3afaac997d067730be (patch) | |
| tree | e57c43b6b2c5bf1340599be36f257f9f8be99cfb /apps | |
| parent | 4c62d71db7f1b8ff490011bcc5050e835b70e745 (diff) | |
| parent | 491250320a6b19f9a7d546598e97eac1e90f78f7 (diff) | |
| download | nextcloud-server-bcdb3c26da28e3797833da3afaac997d067730be.tar.gz nextcloud-server-bcdb3c26da28e3797833da3afaac997d067730be.zip | |
Merge pull request #19236 from owncloud/call_dot_directories_function
Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/lib/amazons3.php | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/swift.php | 4 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 34e8974a6d5..24a0346df63 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -517,7 +517,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { $dh = $this->opendir($path1); if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { - if ($file === '.' || $file === '..') { + if (\OC\Files\Filesystem::isIgnoredDir($file)) { continue; } diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 6f93f3c84cd..20d2b8f4988 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -175,7 +175,7 @@ class Swift extends \OC\Files\Storage\Common { $dh = $this->opendir($path); while ($file = readdir($dh)) { - if ($file === '.' || $file === '..') { + if (\OC\Files\Filesystem::isIgnoredDir($file)) { continue; } @@ -429,7 +429,7 @@ class Swift extends \OC\Files\Storage\Common { $dh = $this->opendir($path1); while ($file = readdir($dh)) { - if ($file === '.' || $file === '..') { + if (\OC\Files\Filesystem::isIgnoredDir($file)) { continue; } diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 3b2d4cf5929..2a9df94988d 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -895,7 +895,7 @@ class Trashbin { $view = new \OC\Files\View('/' . $user . '/files_trashbin'); if ($view->is_dir('/files') && $dh = $view->opendir('/files')) { while ($file = readdir($dh)) { - if ($file !== '.' and $file !== '..') { + if (!\OC\Files\Filesystem::isIgnoredDir($file)) { return false; } } |