From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 includes/libs/objectcache/XCacheBagOStuff.php | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'includes/libs/objectcache/XCacheBagOStuff.php')

diff --git a/includes/libs/objectcache/XCacheBagOStuff.php b/includes/libs/objectcache/XCacheBagOStuff.php
index cfee9236..9dbff6f1 100644
--- a/includes/libs/objectcache/XCacheBagOStuff.php
+++ b/includes/libs/objectcache/XCacheBagOStuff.php
@@ -28,14 +28,7 @@
  * @ingroup Cache
  */
 class XCacheBagOStuff extends BagOStuff {
-	/**
-	 * Get a value from the XCache object cache
-	 *
-	 * @param string $key Cache key
-	 * @param mixed $casToken Cas token
-	 * @return mixed
-	 */
-	public function get( $key, &$casToken = null ) {
+	public function get( $key, &$casToken = null, $flags = 0 ) {
 		$val = xcache_get( $key );
 
 		if ( is_string( $val ) ) {
@@ -51,14 +44,6 @@ class XCacheBagOStuff extends BagOStuff {
 		return $val;
 	}
 
-	/**
-	 * Store a value in the XCache object cache
-	 *
-	 * @param string $key Cache key
-	 * @param mixed $value Object to store
-	 * @param int $expire Expiration time
-	 * @return bool
-	 */
 	public function set( $key, $value, $expire = 0 ) {
 		if ( !$this->isInteger( $value ) ) {
 			$value = serialize( $value );
@@ -68,12 +53,6 @@ class XCacheBagOStuff extends BagOStuff {
 		return true;
 	}
 
-	/**
-	 * Remove a value from the XCache object cache
-	 *
-	 * @param string $key Cache key
-	 * @return bool
-	 */
 	public function delete( $key ) {
 		xcache_unset( $key );
 		return true;
-- 
cgit v1.2.3-54-g00ecf