From: aude <aude.wiki@gmail.com>
Date: Mon, 23 Feb 2015 11:35:55 +0000 (+0100)
Subject: Make HashBagOStuff::lock() compatible with BagOStuff::lock
X-Git-Tag: 1.31.0-rc.0~12297^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=e6536409247d0488994501e8fae1f5364f392acc;p=lhc%2Fweb%2Fwiklou.git

Make HashBagOStuff::lock() compatible with BagOStuff::lock

Fixes php strict standard error.

Bug: T90427
Change-Id: Ica2bddead9b5ad367510e898eeea1257a53b5b19
---

diff --git a/includes/objectcache/HashBagOStuff.php b/includes/objectcache/HashBagOStuff.php
index 9d65e3891f..2c8b05a59d 100644
--- a/includes/objectcache/HashBagOStuff.php
+++ b/includes/objectcache/HashBagOStuff.php
@@ -77,7 +77,7 @@ class HashBagOStuff extends BagOStuff {
 		return true;
 	}
 
-	function lock( $key ) {
+	public function lock( $key, $timeout = 6, $expiry = 6 ) {
 		return true;
 	}