dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix some issues with Microsoft SQL Server support"
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
HashBagOStuff.php
diff --git
a/includes/objectcache/HashBagOStuff.php
b/includes/objectcache/HashBagOStuff.php
index
d061eff
..
db0e579
100644
(file)
--- a/
includes/objectcache/HashBagOStuff.php
+++ b/
includes/objectcache/HashBagOStuff.php
@@
-35,7
+35,7
@@
class HashBagOStuff extends BagOStuff {
}
/**
}
/**
- * @param
$key string
+ * @param
string $key
* @return bool
*/
protected function expire( $key ) {
* @return bool
*/
protected function expire( $key ) {
@@
-51,8
+51,8
@@
class HashBagOStuff extends BagOStuff {
}
/**
}
/**
- * @param
$key string
- * @param
$casToken[optional] mixed
+ * @param
string $key
+ * @param
mixed $casToken [optional]
* @return bool|mixed
*/
function get( $key, &$casToken = null ) {
* @return bool|mixed
*/
function get( $key, &$casToken = null ) {
@@
-64,15
+64,15
@@
class HashBagOStuff extends BagOStuff {
return false;
}
return false;
}
- $casToken =
$this->bag[$key][0]
;
+ $casToken =
serialize( $this->bag[$key][0] )
;
return $this->bag[$key][0];
}
/**
return $this->bag[$key][0];
}
/**
- * @param
$key string
- * @param
$value mixed
- * @param
$exptime int
+ * @param
string $key
+ * @param
mixed $value
+ * @param
int $exptime
* @return bool
*/
function set( $key, $value, $exptime = 0 ) {
* @return bool
*/
function set( $key, $value, $exptime = 0 ) {
@@
-81,14
+81,14
@@
class HashBagOStuff extends BagOStuff {
}
/**
}
/**
- * @param
$casToken mixed
- * @param
$key string
- * @param
$value mixed
- * @param
$exptime int
+ * @param
mixed $casToken
+ * @param
string $key
+ * @param
mixed $value
+ * @param
int $exptime
* @return bool
*/
function cas( $casToken, $key, $value, $exptime = 0 ) {
* @return bool
*/
function cas( $casToken, $key, $value, $exptime = 0 ) {
- if (
$this->get( $key
) === $casToken ) {
+ if (
serialize( $this->get( $key )
) === $casToken ) {
return $this->set( $key, $value, $exptime );
}
return $this->set( $key, $value, $exptime );
}
@@
-96,8
+96,8
@@
class HashBagOStuff extends BagOStuff {
}
/**
}
/**
- * @param
$key string
- * @param
$time int
+ * @param
string $key
+ * @param
int $time
* @return bool
*/
function delete( $key, $time = 0 ) {
* @return bool
*/
function delete( $key, $time = 0 ) {