diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-24 17:28:07 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-24 17:28:07 +0200 |
| commit | 40257d9736ce0d7bad02bf4a1baa86d9b1fc8f7f (patch) | |
| tree | d796e440661538dec9e52fc4f19aaa5bed6903c9 /lib/private | |
| parent | f9091a85847124a12dd459d5cb9683b400d69b6b (diff) | |
| parent | 35321c7d416202228326e774cac620025b7d0f26 (diff) | |
| download | nextcloud-server-40257d9736ce0d7bad02bf4a1baa86d9b1fc8f7f.tar.gz nextcloud-server-40257d9736ce0d7bad02bf4a1baa86d9b1fc8f7f.zip | |
Merge pull request #8339 from owncloud/fix_unit_tests
fixing unit tests
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/share/share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index a18c54af8a3..0f69a94453a 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1612,9 +1612,9 @@ class Share extends \OC\Share\Constants { $select = '*'; if ($format == self::FORMAT_STATUSES) { if ($fileDependent) { - $select = '`*PREFIX*share`.`id`, `*PREFIX*share`.`parent`, `share_type`, `path`, `storage`, `share_with`, `uid_owner` , `file_source`'; + $select = '`*PREFIX*share`.`id`, `*PREFIX*share`.`parent`, `share_type`, `path`, `storage`, `share_with`, `uid_owner` , `file_source`, `stime`'; } else { - $select = '`id`, `parent`, `share_type`, `share_with`, `uid_owner`, `item_source`'; + $select = '`id`, `parent`, `share_type`, `share_with`, `uid_owner`, `item_source`, `stime`'; } } else { if (isset($uidOwner)) { @@ -1630,7 +1630,7 @@ class Share extends \OC\Share\Constants { if ($fileDependent) { if ($format == \OC_Share_Backend_File::FORMAT_GET_FOLDER_CONTENTS || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) { $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`, `uid_owner`, ' - . '`share_type`, `share_with`, `file_source`, `path`, `file_target`, ' + . '`share_type`, `share_with`, `file_source`, `path`, `file_target`, `stime`, ' . '`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, ' . '`name`, `mtime`, `mimetype`, `mimepart`, `size`, `unencrypted_size`, `encrypted`, `etag`, `mail_send`'; } else { |