Skip to content
Snippets Groups Projects
Unverified Commit 38adda4a authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

Merge pull request #15146 from nextcloud/fix/customer_properties_boom

Prefetching blows up if there are a lot of files.
parents 40293052 c16d116f
No related branches found
No related tags found
No related merge requests found
...@@ -129,13 +129,6 @@ class CustomPropertiesBackend implements BackendInterface { ...@@ -129,13 +129,6 @@ class CustomPropertiesBackend implements BackendInterface {
return; return;
} }
if ($node instanceof Directory
&& $propFind->getDepth() !== 0
) {
// note: pre-fetching only supported for depth <= 1
$this->loadChildrenProperties($node, $requestedProps);
}
$props = $this->getProperties($node, $requestedProps); $props = $this->getProperties($node, $requestedProps);
foreach ($props as $propName => $propValue) { foreach ($props as $propName => $propValue) {
$propFind->set($propName, $propValue); $propFind->set($propName, $propValue);
......
...@@ -226,10 +226,6 @@ class CustomPropertiesBackendTest extends \Test\TestCase { ...@@ -226,10 +226,6 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
->method('getPath') ->method('getPath')
->will($this->returnValue('/dummypath/test.txt')); ->will($this->returnValue('/dummypath/test.txt'));
$rootNode->expects($this->once())
->method('getChildren')
->will($this->returnValue(array($nodeSub)));
$this->tree->expects($this->at(0)) $this->tree->expects($this->at(0))
->method('getNodeForPath') ->method('getNodeForPath')
->with('/dummypath') ->with('/dummypath')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment