X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fobjectcache%2FBagOStuff.php;h=217142c0b4e43c71c73da239ce2d96001944cc8a;hb=feeac7bdfc9c629e40e5de0b1825daa2bd634a55;hp=4a27692f08f11092e643c8a39305254614039308;hpb=8f12ae314af362c6f495188564618732f944538c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/BagOStuff.php b/includes/objectcache/BagOStuff.php
index 4a27692f08..217142c0b4 100644
--- a/includes/objectcache/BagOStuff.php
+++ b/includes/objectcache/BagOStuff.php
@@ -142,7 +142,7 @@ abstract class BagOStuff {
 	 * @return bool success
 	 */
 	protected function mergeViaLock( $key, closure $callback, $exptime = 0, $attempts = 10 ) {
-		if ( !$this->lock( $key, 60 ) ) {
+		if ( !$this->lock( $key, 6 ) ) {
 			return false;
 		}
 
@@ -168,7 +168,7 @@ abstract class BagOStuff {
 	 * @param $timeout integer [optional]
 	 * @return bool success
 	 */
-	public function lock( $key, $timeout = 60 ) {
+	public function lock( $key, $timeout = 6 ) {
 		$timestamp = microtime( true ); // starting UNIX timestamp
 		if ( $this->add( "{$key}:lock", 1, $timeout ) ) {
 			return true;