From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 21 May 2010 05:20:36 +0000 (+0000)
Subject: Pivot the interpretation of expiry time at 10 years (1980) instead of 1 month.
X-Git-Tag: 1.31.0-rc.0~36774
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=b19a923ff24c589bac54ce324408da1de4696242;p=lhc%2Fweb%2Fwiklou.git

Pivot the interpretation of expiry time at 10 years (1980) instead of 1 month.
---

diff --git a/includes/BagOStuff.php b/includes/BagOStuff.php
index 8cd5d543ca..563127dc78 100644
--- a/includes/BagOStuff.php
+++ b/includes/BagOStuff.php
@@ -154,7 +154,7 @@ abstract class BagOStuff {
 	 * Convert an optionally relative time to an absolute time
 	 */
 	protected function convertExpiry( $exptime ) {
-		if ( ( $exptime != 0 ) && ( $exptime < 3600 * 24 * 30 ) ) {
+		if ( ( $exptime != 0 ) && ( $exptime < 86400 * 3650 /* 10 years */ ) ) {
 			return time() + $exptime;
 		} else {
 			return $exptime;