diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-09-17 13:34:15 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-09-17 13:45:26 +0200 |
| commit | 1911472b88898868969bfbefa16e0e2e3168c146 (patch) | |
| tree | 3020ca01344861739812e22484b398d40b3cc75b /lib/private/share | |
| parent | c9397dffea9da757d18514e8eb303c3c88756c84 (diff) | |
| download | nextcloud-server-1911472b88898868969bfbefa16e0e2e3168c146.tar.gz nextcloud-server-1911472b88898868969bfbefa16e0e2e3168c146.zip | |
Discard expiration date from result for non-link shares
Diffstat (limited to 'lib/private/share')
| -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; + } } /** |