Skip to content

Commit

Permalink
Merge pull request #43829 from nextcloud/backport/43787/stable26
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Feb 29, 2024
2 parents b90ed9f + e208014 commit 1a027a9
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/private/Files/Storage/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
use OCP\Files\Storage\ILockingStorage;
use OCP\Files\Storage\IStorage;
use OCP\Files\Storage\IWriteStreamStorage;
use OCP\Files\StorageNotAvailableException;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use Psr\Log\LoggerInterface;
Expand Down Expand Up @@ -891,6 +892,11 @@ public function writeStream(string $path, $stream, int $size = null): int {

public function getDirectoryContent($directory): \Traversable {
$dh = $this->opendir($directory);

if ($dh === false) {
throw new StorageNotAvailableException('Directory listing failed');
}

if (is_resource($dh)) {
$basePath = rtrim($directory, '/');
while (($file = readdir($dh)) !== false) {
Expand Down

0 comments on commit 1a027a9

Please sign in to comment.