fix calculation of expiration date if there is a default expiration date...

... set (but not forced) and the user does not want the link to expire.

seems related to #11288