| Index: trunk/extensions/FlaggedRevs/dataclasses/FlaggedPageConfig.php |
| — | — | @@ -185,9 +185,7 @@ |
| 186 | 186 | */ |
| 187 | 187 | public static function purgeExpiredConfigurations() { |
| 188 | 188 | if ( wfReadOnly() ) return; |
| 189 | | - # Get a separate master session for this transaction (deadlock avoidance) |
| 190 | | - $lb = wfGetLBFactory()->newMainLB(); |
| 191 | | - $dbw = $lb->getConnection( DB_MASTER ); |
| | 189 | + $dbw = wfGetDB( DB_MASTER ); |
| 192 | 190 | # Find pages with expired configs... |
| 193 | 191 | $config = self::getDefaultVisibilitySettings(); // config is to be reset |
| 194 | 192 | $encCutoff = $dbw->addQuotes( $dbw->timestamp() ); |
| — | — | @@ -235,8 +233,5 @@ |
| 236 | 234 | FlaggedRevs::HTMLCacheUpdates( $title ); // purge pages that use this page |
| 237 | 235 | } |
| 238 | 236 | } |
| 239 | | - # Commit this transaction and close session |
| 240 | | - $lb->commitMasterChanges(); |
| 241 | | - $lb->closeAll(); |
| 242 | 237 | } |
| 243 | 238 | } |