Merge branch 'master' into shared-folder-etags

Conflicts:
	apps/files_sharing/lib/sharedstorage.php

2 files changed, 15 insertions, 4 deletions

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index ceabc7d548b..b5d506b173b 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -72,7 +72,11 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	public function formatItems($items, $format, $parameters = null) {
 		if ($format == self::FORMAT_SHARED_STORAGE) {
 			// Only 1 item should come through for this format call
-			return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner']);
+			return array(
+				'path' => $items[key($items)]['path'],
+				'permissions' => $items[key($items)]['permissions'],
+				'uid_owner' => $items[key($items)]['uid_owner']
+			);
 		} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
 			$files = array();
 			foreach ($items as $item) {
@@ -100,7 +104,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				}
 				$size += (int)$item['size'];
 			}
-			return array('fileid' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size);
+			return array(
+				'fileid' => -1,
+				'name' => 'Shared',
+				'mtime' => $mtime,
+				'mimetype' => 'httpd/unix-directory',
+				'size' => $size
+			);
 		} else if ($format == self::FORMAT_OPENDIR) {
 			$files = array();
 			foreach ($items as $item) {
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 11c8c6b1e80..4426beec636 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -33,7 +33,8 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
 		}
 		while (!empty($parents)) {
 			$parents = "'".implode("','", $parents)."'";
-			$query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache` WHERE `parent` IN ('.$parents.')');
+			$query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
+				.' WHERE `parent` IN ('.$parents.')');
 			$result = $query->execute();
 			$parents = array();
 			while ($file = $result->fetchRow()) {
@@ -47,4 +48,4 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
 		return $children;
 	}
 
-}
\ No newline at end of file
+}