diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 11:47:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 11:47:37 +0200 |
| commit | 6006a03ef1361f8805c323627fb6d8e9c37be9cd (patch) | |
| tree | 9395bc2386e529f950f6d433712894079bc8c157 | |
| parent | d7d3e8d80245a671f531de2fd765523322647032 (diff) | |
| parent | 1911472b88898868969bfbefa16e0e2e3168c146 (diff) | |
| download | nextcloud-server-6006a03ef1361f8805c323627fb6d8e9c37be9cd.tar.gz nextcloud-server-6006a03ef1361f8805c323627fb6d8e9c37be9cd.zip | |
Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
Discard expiration date from result for non-link shares
| -rw-r--r-- | lib/private/share/share.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 802b146cfb6..07c7f31a853 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -2441,6 +2441,11 @@ class Share extends Constants { if (isset($row['stime'])) { $row['stime'] = (int) $row['stime']; } + if (isset($row['expiration']) && $row['share_type'] !== self::SHARE_TYPE_LINK) { + // discard expiration date for non-link shares, which might have been + // set by ancient bugs + $row['expiration'] = null; + } } /** |