return mailSend status in getItems()

diff --git a/core/js/share.js b/core/js/share.js
index c806d83f10ce338f77b5ae34cbe47b52e5c6d634..7d7f580c9bb7543fda53a0477352005ae91d2e7e 100644 (file)
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -114,6 +114,7 @@ OC.Share={
                                data = false;
                        }
                }});
+
                return data;
        },
        share:function(itemType, itemSource, shareType, shareWith, permissions, callback) {
@@ -219,7 +220,7 @@ OC.Share={
                                                if (share.collection) {
                                                        OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, share.collection);
                                                } else {
-                                                       OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.mail_send,  share.permissions, possiblePermissions, share.mail_send, false);
+                                                       OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, false);
                                                }
                                        }
                                        if (share.expiration != null) {
@@ -344,7 +345,7 @@ OC.Share={
                        mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
                        if (mailNotificationEnabled === 'yes') {
                                checked = '';
-                               if (mailSend === true) {
+                               if (mailSend === '1') {
                                        checked = 'checked';
                                }
                                html += '<input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify user by email')+'</label>';

diff --git a/lib/public/share.php b/lib/public/share.php
index eac6fab2b6a937be90135d8e4cdb93c70eaf16dc..c2dd0096ab92e215d65b45d9e6d514dcf5876176 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1030,19 +1030,19 @@ class Share {
                if ($format == self::FORMAT_STATUSES) {
                        if ($itemType == 'file' || $itemType == 'folder') {
                                $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
-                                       .' `share_type`, `file_source`, `path`, `expiration`, `storage`';
+                                       .' `share_type`, `file_source`, `path`, `expiration`, `storage`, `mail_send`';
                        } else {
-                               $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`';
+                               $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`, `mail_send`';
                        }
                } else {
                        if (isset($uidOwner)) {
                                if ($itemType == 'file' || $itemType == 'folder') {
                                        $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
                                                .' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,'
-                                               .' `expiration`, `token`, `storage`';
+                                               .' `expiration`, `token`, `storage`, `storage`, `mail_send`';
                                } else {
                                        $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,'
-                                               .' `stime`, `file_source`, `expiration`, `token`';
+                                               .' `stime`, `file_source`, `expiration`, `token`, `storage`, `mail_send`';
                                }
                        } else {
                                if ($fileDependent) {
@@ -1053,11 +1053,11 @@ class Share {
                                                $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`, '
-                                                       .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
+                                                       .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`, `storage`, `mail_send`';
                                        } else {
                                                $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
                                                        `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,
-                                                       `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`';
+                                                       `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`, `storage`, `mail_send`';
                                        }
                                } else {
                                        $select = '*';