diff options
author | James Walker <walkah@walkah.net> | 2010-07-27 12:18:40 -0400 |
---|---|---|
committer | James Walker <walkah@walkah.net> | 2010-07-27 12:18:40 -0400 |
commit | 772018810b7b6ea2b8cf18a1b9275fbac8c78343 (patch) | |
tree | df788d098e5f982322c36d7c2954ac41f9b21fda /classes/Memcached_DataObject.php | |
parent | 7065450f03078fb1ac2105b75f9c7a4e052bca9c (diff) | |
parent | 65862d8f7f45d487d4714137af96d3a24e4ca386 (diff) |
Merge branch 'master' into testing
Diffstat (limited to 'classes/Memcached_DataObject.php')
-rw-r--r-- | classes/Memcached_DataObject.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 4579f64df..a7fec365e 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -593,7 +593,7 @@ class Memcached_DataObject extends Safe_DataObject return $c->get($cacheKey); } - static function cacheSet($keyPart, $value) + static function cacheSet($keyPart, $value, $flag=null, $expiry=null) { $c = self::memcache(); @@ -603,7 +603,7 @@ class Memcached_DataObject extends Safe_DataObject $cacheKey = common_cache_key($keyPart); - return $c->set($cacheKey, $value); + return $c->set($cacheKey, $value, $flag, $expiry); } static function valueString($v) |