X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fobjectcache%2FHashBagOStuff.php;h=db0e579922a7178b16b7aa4a805d98df44716483;hb=13e33c28983461d5b8bdc1dece0cd0a35347a261;hp=d061eff0ec09b1347d603ac1fbf757d0ee0a7604;hpb=62a6a48bd4cde140a2bebde73f882754dfaa273b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/HashBagOStuff.php b/includes/objectcache/HashBagOStuff.php
index d061eff0ec..db0e579922 100644
--- 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 ) {
@@ -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 ) {
@@ -64,15 +64,15 @@ class HashBagOStuff extends BagOStuff {
 			return false;
 		}
 
-		$casToken = $this->bag[$key][0];
+		$casToken = serialize( $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 ) {
@@ -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 ) {
-		if ( $this->get( $key ) === $casToken ) {
+		if ( serialize( $this->get( $key ) ) === $casToken ) {
 			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 ) {