X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fparser%2FCacheTime.php;h=05bcebef64cd6e3a9da3761b3a2bb18abc9a9eed;hb=be42e09aa866d7def54ead06c91d5dc9c8210ce5;hp=950c0d46df76fa781377035d690fed089c2c1beb;hpb=41253c21224358e482b21618929a7fd5675f6f66;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/CacheTime.php b/includes/parser/CacheTime.php
index 950c0d46df..05bcebef64 100644
--- a/includes/parser/CacheTime.php
+++ b/includes/parser/CacheTime.php
@@ -32,10 +32,17 @@ class CacheTime {
 	 */
 	public $mUsedOptions;
 
-	public $mVersion = Parser::VERSION,  # Compatibility check
-		$mCacheTime = '',             # Time when this object was generated, or -1 for uncacheable. Used in ParserCache.
-		$mCacheExpiry = null,         # Seconds after which the object should expire, use 0 for uncacheable. Used in ParserCache.
-		$mCacheRevisionId = null;     # Revision ID that was parsed
+	# Compatibility check
+	public $mVersion = Parser::VERSION;
+
+	# Time when this object was generated, or -1 for uncacheable. Used in ParserCache.
+	public $mCacheTime = '';
+
+	# Seconds after which the object should expire, use 0 for uncacheable. Used in ParserCache.
+	public $mCacheExpiry = null;
+
+	# Revision ID that was parsed
+	public $mCacheRevisionId = null;
 
 	/**
 	 * @return string TS_MW timestamp
@@ -47,7 +54,7 @@ class CacheTime {
 	/**
 	 * setCacheTime() sets the timestamp expressing when the page has been rendered.
 	 * This does not control expiry, see updateCacheExpiry() for that!
-	 * @param string $t
+	 * @param string $t TS_MW timestamp
 	 * @return string
 	 */
 	public function setCacheTime( $t ) {
@@ -72,12 +79,15 @@ class CacheTime {
 
 	/**
 	 * Sets the number of seconds after which this object should expire.
+	 *
 	 * This value is used with the ParserCache.
 	 * If called with a value greater than the value provided at any previous call,
 	 * the new call has no effect. The value returned by getCacheExpiry is smaller
 	 * or equal to the smallest number that was provided as an argument to
 	 * updateCacheExpiry().
 	 *
+	 * Avoid using 0 if at all possible. Consider JavaScript for highly dynamic content.
+	 *
 	 * @param int $seconds
 	 */
 	public function updateCacheExpiry( $seconds ) {
@@ -86,11 +96,6 @@ class CacheTime {
 		if ( $this->mCacheExpiry === null || $this->mCacheExpiry > $seconds ) {
 			$this->mCacheExpiry = $seconds;
 		}
-
-		// hack: set old-style marker for uncacheable entries.
-		if ( $this->mCacheExpiry !== null && $this->mCacheExpiry <= 0 ) {
-			$this->mCacheTime = -1;
-		}
 	}
 
 	/**