Merge pull request #19216 from owncloud/stable8.1-discardexpirationda…

…tefornonlinkshares [stable8.1] Discard expiration date from result for non-link shares
owncloud · Sep 24, 2015 · d6994b2 · d6994b2
2 parents c4667d5 + c48a61a
commit d6994b2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
@@ -2394,6 +2394,11 @@ private static function transformDBResults(&$row) {
 		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;
+		}
 	}
 
 	/**