expiration can be specified as string

dg · Nov 5, 2014 · c04c331 · c04c331
1 parent 802bf2d
commit c04c331
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/twitter.class.php b/src/twitter.class.php
@@ -25,7 +25,7 @@ class Twitter
 	/**#@-*/
 
 	/** @var int */
-	public static $cacheExpire = 1800; // 30 min
+	public static $cacheExpire = '30 minutes';
 
 	/** @var string */
 	public static $cacheDir;
@@ -304,7 +304,8 @@ public function cachedRequest($resource, array $data = NULL, $cacheExpire = NULL
 			. '.json';
 
 		$cache = @json_decode(@file_get_contents($cacheFile)); // intentionally @
-		if ($cache && @filemtime($cacheFile) + $cacheExpire > time()) { // intentionally @
+		$expiration = is_string($cacheExpire) ? strtotime($cacheExpire) - time() : $cacheExpire;
+		if ($cache && @filemtime($cacheFile) + $expiration > time()) { // intentionally @
 			return $cache;
 		}