Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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

Open
wants to merge 1 commit into from

3 participants

Kostya Kufta Kohana Builds Kiall Mac Innes
Kostya Kufta

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

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

Jenkins Build Starting

Kiall Mac Innes

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

Kiall Mac Innes

!build

Kohana Builds
Collaborator

Jenkins Build Starting

Kiall Mac Innes kiall closed this December 31, 2011
Kiall Mac Innes

Duplicate of pull #14

Kiall Mac Innes kiall reopened this December 31, 2011
Kiall Mac Innes

Whoops, They target different branches..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Sep 24, 2011
Kostya Kufta Refs #4101
If lifetime is less than 2592000, no need add current time
928cdcb
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 2 additions and 7 deletions. Show diff stats Hide diff stats

  1. 9  classes/kohana/cache/memcache.php
9  classes/kohana/cache/memcache.php
@@ -217,13 +217,8 @@ public function set($id, $data, $lifetime = 3600)
217 217
 			// Set the lifetime to maximum cache time
218 218
 			$lifetime = Cache_Memcache::CACHE_CEILING + time();
219 219
 		}
220  
-		// Else if the lifetime is greater than zero
221  
-		elseif ($lifetime > 0)
222  
-		{
223  
-			$lifetime += time();
224  
-		}
225  
-		// Else
226  
-		else
  220
+		// Else if the lifetime is less than zero	
  221
+		elseif ($lifetime < 0)
227 222
 		{
228 223
 			// Normalise the lifetime
229 224
 			$lifetime = 0;
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.