]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix webdav errors for empty folders
authorRobin Appelman <icewind@owncloud.com>
Wed, 27 Jun 2012 11:08:16 +0000 (13:08 +0200)
committerRobin Appelman <icewind@owncloud.com>
Wed, 27 Jun 2012 11:08:16 +0000 (13:08 +0200)
lib/connector/sabre/directory.php

index 9832449af3a450b3edc2ebf6baf04c7dd1daaa1f..b75bb5c50f50d3e0d19876a86de2401d9fc8c91b 100644 (file)
@@ -90,16 +90,18 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
                foreach($folder_content as $info) {
                        $paths[] = $this->path.'/'.$info['name'];
                }
-               $placeholders = join(',', array_fill(0, count($paths), '?'));
-               $query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ?' . ' AND propertypath IN ('.$placeholders.')' );
-               array_unshift($paths, OC_User::getUser()); // prepend userid
-               $result = $query->execute( $paths );
                $properties = array_fill_keys($paths, array());
-               while($row = $result->fetchRow()) {
-                       $propertypath = $row['propertypath'];
-                       $propertyname = $row['propertyname'];
-                       $propertyvalue = $row['propertyvalue'];
-                       $properties[$propertypath][$propertyname] = $propertyvalue;
+               if(count($paths)>0){
+                       $placeholders = join(',', array_fill(0, count($paths), '?'));
+                       $query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ?' . ' AND propertypath IN ('.$placeholders.')' );
+                       array_unshift($paths, OC_User::getUser()); // prepend userid
+                       $result = $query->execute( $paths );
+                       while($row = $result->fetchRow()) {
+                               $propertypath = $row['propertypath'];
+                               $propertyname = $row['propertyname'];
+                               $propertyvalue = $row['propertyvalue'];
+                               $properties[$propertypath][$propertyname] = $propertyvalue;
+                       }
                }
 
                $nodes = array();