* (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;"
* (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow()
- === 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() {
- // https://bugzilla.wikimedia.org/show_bug.cgi?id=28485
- // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
- $lb = wfGetLBFactory()->newMainLB();
- $dbw = $lb->getConnection( DB_MASTER );
-
+ $dbw = wfGetDB( DB_MASTER );
$dbw->delete( 'ipblocks', array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ );
-
- $lb->commitMasterChanges();
- $lb->closeAll();
}
/**