Skip to content

Commit

Permalink
Merge pull request #31212 from owncloud/stable10-mail-use-correct-exp…
Browse files Browse the repository at this point in the history
…iration-field

[stable10] Fix share email with wrong expiration date
  • Loading branch information
Vincent Petry authored Apr 19, 2018
2 parents 4194509 + bf330ed commit 60430ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Added command to verify and fix checksums - [#31008](https://github.com/owncloud/core/pull/31008)
- Introduce seen and single user sync command line features - [#31025](https://github.com/owncloud/core/issues/31025) [#31032](https://github.com/owncloud/core/issues/31032)
- Added config setting to specify minimum characters for sharing autocomplete - [#30994](https://github.com/owncloud/core/issues/30994) [#31067](https://github.com/owncloud/core/issues/31067) [#31160](https://github.com/owncloud/core/pull/31160)
- Added personal note field for link share email - [#30486](https://github.com/owncloud/core/issues/30486) [#30571](https://github.com/owncloud/core/issues/30571) [#30813](https://github.com/owncloud/core/issues/30813) [#31057](https://github.com/owncloud/core/issues/31057)
- Added personal note field for link share email - [#30486](https://github.com/owncloud/core/issues/30486) [#30571](https://github.com/owncloud/core/issues/30571) [#30813](https://github.com/owncloud/core/issues/30813) [#31057](https://github.com/owncloud/core/issues/31057) [#31201](https://github.com/owncloud/core/pull/31201) [#31212](https://github.com/owncloud/core/pull/31212)
- Add conditional Logging target logfile for shared_secret and users - [#30443](https://github.com/owncloud/core/issues/30443)
- Add option to disable link share password enforcement for write-only shares - [#30408](https://github.com/owncloud/core/issues/30408) [#30774](https://github.com/owncloud/core/issues/30774) [#30787](https://github.com/owncloud/core/issues/30787)
- Add Webdav-Location header in private link redirect - [#30387](https://github.com/owncloud/core/issues/30387) [#30595](https://github.com/owncloud/core/issues/30595)
Expand Down
2 changes: 1 addition & 1 deletion core/ajax/share.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
'link' => $_POST['link'],
'file' => $_POST['file'],
'toAddress' => $_POST['toAddress'],
'expiration' => $_POST['expiration'],
'expirationDate' => $_POST['expiration'],
'personalNote' => $emailBody
]);

Expand Down

0 comments on commit 60430ff

Please sign in to comment.