summaryrefslogtreecommitdiff
path: root/system/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-08 15:37:24 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-08 15:37:24 -0800
commit5a8d48a86953781c682be7c8052ae804c65f7e3b (patch)
tree9425dd46f8997860a29b16d16a4d667336940ec8 /system/helpers
parent9864ab4b2708ec54c39092a21828403cbbd25e2e (diff)
parentbd9f945e3f2de4ea2402bd3941dba69c79ddc5a4 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/expires.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/system/helpers/expires.php b/system/helpers/expires.php
index 81468ce3..d510ba7c 100644
--- a/system/helpers/expires.php
+++ b/system/helpers/expires.php
@@ -82,7 +82,6 @@ class expires_Core {
{
$last_modified = $now;
}
- $max_age = $expires - time();
if ($modified <= $last_modified)
{