From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 20 Mar 2019 04:16:25 +0000 (-0700)
Subject: Fix fatal due to lock name mismatch in Maintenance::unlockSearchindex
X-Git-Tag: 1.34.0-rc.0~2419^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=7d33a793e4080cdc42c9ad1c747e6d64d6019f71;p=lhc%2Fweb%2Fwiklou.git

Fix fatal due to lock name mismatch in Maintenance::unlockSearchindex

Change-Id: Id18c0c8eb20c215ba7421e087b721ac7dc57227a
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index ad748f330a..3403e82a06 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1445,7 +1445,7 @@ abstract class Maintenance {
 			'user',
 			'page_restrictions'
 		];
-		$db->lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
+		$db->lockTables( $read, $write, __CLASS__ . '-searchIndexLock' );
 	}
 
 	/**
@@ -1453,7 +1453,7 @@ abstract class Maintenance {
 	 * @param IMaintainableDatabase &$db
 	 */
 	private function unlockSearchindex( $db ) {
-		$db->unlockTables( __CLASS__ . '::' . __METHOD__ );
+		$db->unlockTables( __CLASS__ . '-searchIndexLock' );
 	}
 
 	/**