From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/objectcache/HashBagOStuff.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'includes/objectcache/HashBagOStuff.php')

diff --git a/includes/objectcache/HashBagOStuff.php b/includes/objectcache/HashBagOStuff.php
index 799f26a3..d061eff0 100644
--- a/includes/objectcache/HashBagOStuff.php
+++ b/includes/objectcache/HashBagOStuff.php
@@ -52,9 +52,10 @@ class HashBagOStuff extends BagOStuff {
 
 	/**
 	 * @param $key string
+	 * @param $casToken[optional] mixed
 	 * @return bool|mixed
 	 */
-	function get( $key ) {
+	function get( $key, &$casToken = null ) {
 		if ( !isset( $this->bag[$key] ) ) {
 			return false;
 		}
@@ -63,6 +64,8 @@ class HashBagOStuff extends BagOStuff {
 			return false;
 		}
 
+		$casToken = $this->bag[$key][0];
+
 		return $this->bag[$key][0];
 	}
 
@@ -77,6 +80,21 @@ class HashBagOStuff extends BagOStuff {
 		return true;
 	}
 
+	/**
+	 * @param $casToken mixed
+	 * @param $key string
+	 * @param $value mixed
+	 * @param $exptime int
+	 * @return bool
+	 */
+	function cas( $casToken, $key, $value, $exptime = 0 ) {
+		if ( $this->get( $key ) === $casToken ) {
+			return $this->set( $key, $value, $exptime );
+		}
+
+		return false;
+	}
+
 	/**
 	 * @param $key string
 	 * @param $time int
@@ -91,12 +109,4 @@ class HashBagOStuff extends BagOStuff {
 
 		return true;
 	}
-
-	/**
-	 * @return array
-	 */
-	function keys() {
-		return array_keys( $this->bag );
-	}
 }
-
-- 
cgit v1.2.2