Merge pull request #610 from owncloud/fix-609

Fixes broken documents view
owncloud-archive · Mar 1, 2016 · bea795d · bea795d
2 parents 40de183 + 7e18ca2
commit bea795d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php
@@ -163,10 +163,14 @@ public function listAll(){
 		$fileIds = array();
 		$documents = array();
 		foreach ($found as $key=>$document) {
-			if (is_object($document)){
-				$documents[] = $document->getData();
+			$fileData = $document->getData();
+			if (is_object($fileData)){
+				$documents[$key]['fileid'] = $document->getId();
+				$documents[$key]['path'] = $document->getPath();
+				$documents[$key]['name'] = $document->getName();
+				$documents[$key]['etag'] = $document->getEtag();
 			} else {
-				$documents[$key] = $document;
+				$documents[$key] = $fileData;
 			}
 			$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OCP\Template::mimetype_icon($document['mimetype']));
 			$documents[$key]['hasPreview'] = \OC::$server->getPreviewManager()->isMimeSupported($document['mimetype']);