Update to MediaWiki 1.26.0

1 files changed, 9 insertions, 6 deletions

diff --git a/includes/objectcache/MemcachedBagOStuff.php b/includes/objectcache/MemcachedBagOStuff.php
index 83bee700..e545aa55 100644
--- a/includes/objectcache/MemcachedBagOStuff.php
+++ b/includes/objectcache/MemcachedBagOStuff.php
@@ -57,12 +57,7 @@ class MemcachedBagOStuff extends BagOStuff {
 		return $params;
 	}
 
-	/**
-	 * @param string $key
-	 * @param mixed $casToken [optional]
-	 * @return mixed
-	 */
-	public function get( $key, &$casToken = null ) {
+	public function get( $key, &$casToken = null, $flags = 0 ) {
 		return $this->client->get( $this->encodeKey( $key ), $casToken );
 	}
 
@@ -183,4 +178,12 @@ class MemcachedBagOStuff extends BagOStuff {
 	protected function debugLog( $text ) {
 		$this->logger->debug( $text );
 	}
+
+	public function modifySimpleRelayEvent( array $event ) {
+		if ( array_key_exists( 'val', $event ) ) {
+			$event['flg'] = 0; // data is not serialized nor gzipped (for memcached driver)
+		}
+
+		return $event;
+	}
 }