Update to MediaWiki 1.21.1

1 files changed, 24 insertions, 1 deletions

diff --git a/includes/objectcache/EmptyBagOStuff.php b/includes/objectcache/EmptyBagOStuff.php
index bd28b241..62060579 100644
--- a/includes/objectcache/EmptyBagOStuff.php
+++ b/includes/objectcache/EmptyBagOStuff.php
@@ -30,9 +30,10 @@ class EmptyBagOStuff extends BagOStuff {
 
 	/**
 	 * @param $key string
+	 * @param $casToken[optional] mixed
 	 * @return bool
 	 */
-	function get( $key ) {
+	function get( $key, &$casToken = null ) {
 		return false;
 	}
 
@@ -47,6 +48,17 @@ class EmptyBagOStuff extends BagOStuff {
 	}
 
 	/**
+	 * @param $casToken mixed
+	 * @param $key string
+	 * @param $value mixed
+	 * @param $exp int
+	 * @return bool
+	 */
+	function cas( $casToken, $key, $value, $exp = 0 ) {
+		return true;
+	}
+
+	/**
 	 * @param $key string
 	 * @param $time int
 	 * @return bool
@@ -54,6 +66,17 @@ class EmptyBagOStuff extends BagOStuff {
 	function delete( $key, $time = 0 ) {
 		return true;
 	}
+
+	/**
+	 * @param $key string
+	 * @param $callback closure Callback method to be executed
+	 * @param int $exptime Either an interval in seconds or a unix timestamp for expiry
+	 * @param int $attempts The amount of times to attempt a merge in case of failure
+	 * @return bool success
+	 */
+	public function merge( $key, closure $callback, $exptime = 0, $attempts = 10 ) {
+		return true;
+	}
 }
 
 /**