Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Refs #4101 - If lifetime is less than 2592000, no need add current time #13

Closed
wants to merge 1 commit into from

4 participants

@yankos

Refs #4101
If lifetime is less than 2592000, no need add current time

@yankos yankos Refs #4101
If lifetime is less than 2592000, no need add current time
928cdcb
@Kohana-Builds
Collaborator

Jenkins Build Starting

@kiall

The build failure appears to be unrelated to this pull..

@kiall

!build

@Kohana-Builds
Collaborator

Jenkins Build Starting

@kiall

Duplicate of pull #14

@kiall kiall closed this
@kiall kiall reopened this
@kiall

Whoops, They target different branches..

@shadowhand shadowhand closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 24, 2011
  1. @yankos

    Refs #4101

    yankos authored
    If lifetime is less than 2592000, no need add current time
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 7 deletions.
  1. +2 −7 classes/kohana/cache/memcache.php
View
9 classes/kohana/cache/memcache.php
@@ -217,13 +217,8 @@ public function set($id, $data, $lifetime = 3600)
// Set the lifetime to maximum cache time
$lifetime = Cache_Memcache::CACHE_CEILING + time();
}
- // Else if the lifetime is greater than zero
- elseif ($lifetime > 0)
- {
- $lifetime += time();
- }
- // Else
- else
+ // Else if the lifetime is less than zero
+ elseif ($lifetime < 0)
{
// Normalise the lifetime
$lifetime = 0;
Something went wrong with that request. Please try again.