Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2022-01-27 13:08:23 +0300
committerGitHub <noreply@github.com>2022-01-27 13:08:23 +0300
commit34f425c1504a79ef81f400862232bbd6776f5f7a (patch)
treef7685e5cbb23c4055be407cee74610facbfcf8e5
parent3500d8b9805555211438509885b34e5ba60a9c8e (diff)
parentba1338e6800d20311155be5f3a5d8c5738e88a62 (diff)
Merge pull request #30858 from nextcloud/fix/ajax-list-dir-content-on-file
Return 404 when AJAX tries to list dir content but file given
-rw-r--r--apps/files/ajax/list.php2
-rw-r--r--lib/private/Files/Filesystem.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index e43e5dd08e8..8a48d4fbe1f 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -38,7 +38,7 @@ $dir = \OC\Files\Filesystem::normalizePath($dir);
try {
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
- if (!$dirInfo || !$dirInfo->getType() === 'dir') {
+ if (!$dirInfo || $dirInfo->getType() !== 'dir') {
http_response_code(404);
exit();
}
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index a9b1b87c8e7..fb300134c86 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -835,7 +835,7 @@ class Filesystem {
* @param string $path
* @param boolean $includeMountPoints whether to add mountpoint sizes,
* defaults to true
- * @return \OC\Files\FileInfo|bool False if file does not exist
+ * @return \OC\Files\FileInfo|false False if file does not exist
*/
public static function getFileInfo($path, $includeMountPoints = true) {
return self::$defaultInstance->getFileInfo($path, $includeMountPoints);