From 153ca42056288f9b11540bb400f506e679e4068e Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 9 Jun 2014 17:55:19 +0300 Subject: [PATCH] Respect recent mmaster changes. Fixes #271 --- ajax/userController.php | 1 + lib/file.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ajax/userController.php b/ajax/userController.php index 0e127581..e65dbd76 100644 --- a/ajax/userController.php +++ b/ajax/userController.php @@ -36,6 +36,7 @@ class UserController extends Controller{ } } \OCP\JSON::success(); + exit(); } public static function rename($args){ diff --git a/lib/file.php b/lib/file.php index 73c593f6..056281e7 100644 --- a/lib/file.php +++ b/lib/file.php @@ -208,7 +208,7 @@ class File { $query = \OC_DB::prepare('SELECT `*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, ' .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, ' - .'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, ' + .'`*PREFIX*share`.`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, ' .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`' .'FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `item_type` = \'file\' ' . $where); $result = $query->execute($values);