Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-04-24 19:28:07 +0400
committerThomas Müller <thomas.mueller@tmit.eu>2014-04-24 19:28:07 +0400
commit40257d9736ce0d7bad02bf4a1baa86d9b1fc8f7f (patch)
treed796e440661538dec9e52fc4f19aaa5bed6903c9
parentf9091a85847124a12dd459d5cb9683b400d69b6b (diff)
parent35321c7d416202228326e774cac620025b7d0f26 (diff)
Merge pull request #8339 from owncloud/fix_unit_tests
fixing unit tests
-rw-r--r--lib/private/share/share.php6
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 {