From 170ae282338584ebe257d2fb21101ccf84a3f800 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 7 May 2015 10:43:28 +0300
Subject: Issue/PR #3836

---
 system/libraries/Cache/drivers/Cache_redis.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Cache/drivers/Cache_redis.php')

diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index b940b76cb..773d20c43 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -165,7 +165,9 @@ class CI_Cache_redis extends CI_Driver
 	 */
 	public function increment($id, $offset = 1)
 	{
-		return $this->_redis->incr($id, $offset);
+		return ($offset == 1)
+			? $this->_redis->incr($id)
+			: $this->_redis->incrBy($id, $offset);
 	}
 
 	// ------------------------------------------------------------------------
@@ -179,7 +181,9 @@ class CI_Cache_redis extends CI_Driver
 	 */
 	public function decrement($id, $offset = 1)
 	{
-		return $this->_redis->decr($id, $offset);
+		return ($offset == 1)
+			? $this->_redis->decr($id)
+			: $this->_redis->decrBy($id, $offset);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 70f738a14b0f6f70d9292c0f488ea423a76f438e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 7 May 2015 12:16:33 +0300
Subject: Revert "Issue/PR #3836"

This reverts commit 170ae282338584ebe257d2fb21101ccf84a3f800.
---
 system/libraries/Cache/drivers/Cache_redis.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'system/libraries/Cache/drivers/Cache_redis.php')

diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index 773d20c43..b940b76cb 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -165,9 +165,7 @@ class CI_Cache_redis extends CI_Driver
 	 */
 	public function increment($id, $offset = 1)
 	{
-		return ($offset == 1)
-			? $this->_redis->incr($id)
-			: $this->_redis->incrBy($id, $offset);
+		return $this->_redis->incr($id, $offset);
 	}
 
 	// ------------------------------------------------------------------------
@@ -181,9 +179,7 @@ class CI_Cache_redis extends CI_Driver
 	 */
 	public function decrement($id, $offset = 1)
 	{
-		return ($offset == 1)
-			? $this->_redis->decr($id)
-			: $this->_redis->decrBy($id, $offset);
+		return $this->_redis->decr($id, $offset);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From b4f3630ae5240d085cf4283b82546005002e59e4 Mon Sep 17 00:00:00 2001
From: ftwbzhao <b.zhao1@gmail.com>
Date: Wed, 13 May 2015 17:47:41 +0800
Subject: [Cache]minor adjustments for save function

---
 system/libraries/Cache/drivers/Cache_redis.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'system/libraries/Cache/drivers/Cache_redis.php')

diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index b940b76cb..66966ba16 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -125,9 +125,7 @@ class CI_Cache_redis extends CI_Driver
 			$this->_redis->sRemove('_ci_redis_serialized', $id);
 		}
 
-		return ($ttl)
-			? $this->_redis->setex($id, $ttl, $data)
-			: $this->_redis->set($id, $data);
+		return $this->_redis->set($id, $data, $ttl);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b