X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2Fobjectcache%2FHashBagOStuff.php;h=278a74e865158b76d4a8de48ca28c3a1f1efbaa1;hb=eca35903a2390bf7eb503fa0ede6a76ce556dc55;hp=6e50a8c39f0b0e14c3f5adac7659cd9109ef6de9;hpb=348a0bead146d133b3773e1b34bc30e524b6c1bb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/HashBagOStuff.php b/includes/objectcache/HashBagOStuff.php
index 6e50a8c39f..278a74e865 100644
--- a/includes/objectcache/HashBagOStuff.php
+++ b/includes/objectcache/HashBagOStuff.php
@@ -31,7 +31,8 @@ class HashBagOStuff extends BagOStuff {
 	/** @var array */
 	protected $bag;
 
-	function __construct() {
+	function __construct( $params = array() ) {
+		parent::__construct( $params );
 		$this->bag = array();
 	}
 
@@ -56,7 +57,7 @@ class HashBagOStuff extends BagOStuff {
 	 * @param mixed $casToken [optional]
 	 * @return bool|mixed
 	 */
-	function get( $key, &$casToken = null ) {
+	public function get( $key, &$casToken = null ) {
 		if ( !isset( $this->bag[$key] ) ) {
 			return false;
 		}
@@ -65,7 +66,7 @@ class HashBagOStuff extends BagOStuff {
 			return false;
 		}
 
-		$casToken = serialize( $this->bag[$key][0] );
+		$casToken = $this->bag[$key][0];
 
 		return $this->bag[$key][0];
 	}
@@ -76,7 +77,7 @@ class HashBagOStuff extends BagOStuff {
 	 * @param int $exptime
 	 * @return bool
 	 */
-	function set( $key, $value, $exptime = 0 ) {
+	public function set( $key, $value, $exptime = 0 ) {
 		$this->bag[$key] = array( $value, $this->convertExpiry( $exptime ) );
 		return true;
 	}
@@ -88,8 +89,8 @@ class HashBagOStuff extends BagOStuff {
 	 * @param int $exptime
 	 * @return bool
 	 */
-	function cas( $casToken, $key, $value, $exptime = 0 ) {
-		if ( serialize( $this->get( $key ) ) === $casToken ) {
+	protected function cas( $casToken, $key, $value, $exptime = 0 ) {
+		if ( $this->get( $key ) === $casToken ) {
 			return $this->set( $key, $value, $exptime );
 		}
 
@@ -98,10 +99,9 @@ class HashBagOStuff extends BagOStuff {
 
 	/**
 	 * @param string $key
-	 * @param int $time
 	 * @return bool
 	 */
-	function delete( $key, $time = 0 ) {
+	function delete( $key ) {
 		if ( !isset( $this->bag[$key] ) ) {
 			return false;
 		}