* (bug 28372) Fix bogus link to suppressed file versions in ForeignDBRepo
* (bug 27473) Fix regression: bold, italic no longer interfere with linktrail for ca, kaa
* (bug 28444) Fix regression: edit-on-doubleclick retains revision id again
+* (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout
+ exceeded;"
-=== API changes in 1.18 ===
+ === API changes in 1.18 ===
* (bug 26339) Throw warning when truncating an overlarge API result
* (bug 14869) Add API module for accessing QueryPage-based special pages
* (bug 14020) API for Special:Unwatchedpages
* Purge expired blocks from the ipblocks table
*/
public static function purgeExpired() {
- $dbw = wfGetDB( DB_MASTER );
+ $lb = wfGetLBFactory()->newMainLB();
+ $dbw = $lb->getConnection( DB_MASTER );
+
$dbw->delete( 'ipblocks', array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ );
+
+ $lb->commitMasterChanges();
+ $lb->closeAll();
}
/**