| Index: trunk/phase3/includes/WikiPage.php |
| — | — | @@ -905,7 +905,7 @@ |
| 906 | 906 | if ( $wgUseSquid ) { |
| 907 | 907 | // Commit the transaction before the purge is sent |
| 908 | 908 | $dbw = wfGetDB( DB_MASTER ); |
| 909 | | - $dbw->commit(); |
| | 909 | + $dbw->commit( __METHOD__ ); |
| 910 | 910 | |
| 911 | 911 | // Send purge |
| 912 | 912 | $update = SquidUpdate::newSimplePurge( $this->mTitle ); |
| — | — | @@ -1329,7 +1329,7 @@ |
| 1330 | 1330 | $changed = ( strcmp( $text, $oldtext ) != 0 ); |
| 1331 | 1331 | |
| 1332 | 1332 | if ( $changed ) { |
| 1333 | | - $dbw->begin(); |
| | 1333 | + $dbw->begin( __METHOD__ ); |
| 1334 | 1334 | $revisionId = $revision->insertOn( $dbw ); |
| 1335 | 1335 | |
| 1336 | 1336 | # Update page |
| — | — | @@ -1351,7 +1351,7 @@ |
| 1352 | 1352 | } |
| 1353 | 1353 | |
| 1354 | 1354 | $revisionId = 0; |
| 1355 | | - $dbw->rollback(); |
| | 1355 | + $dbw->rollback( __METHOD__ ); |
| 1356 | 1356 | } else { |
| 1357 | 1357 | global $wgUseRCPatrol; |
| 1358 | 1358 | wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId, $user ) ); |
| — | — | @@ -1372,7 +1372,7 @@ |
| 1373 | 1373 | } |
| 1374 | 1374 | } |
| 1375 | 1375 | $user->incEditCount(); |
| 1376 | | - $dbw->commit(); |
| | 1376 | + $dbw->commit( __METHOD__ ); |
| 1377 | 1377 | } |
| 1378 | 1378 | } else { |
| 1379 | 1379 | // Bug 32948: revision ID must be set to page {{REVISIONID}} and |
| — | — | @@ -1405,14 +1405,14 @@ |
| 1406 | 1406 | # Create new article |
| 1407 | 1407 | $status->value['new'] = true; |
| 1408 | 1408 | |
| 1409 | | - $dbw->begin(); |
| | 1409 | + $dbw->begin( __METHOD__ ); |
| 1410 | 1410 | |
| 1411 | 1411 | # Add the page record; stake our claim on this title! |
| 1412 | 1412 | # This will return false if the article already exists |
| 1413 | 1413 | $newid = $this->insertOn( $dbw ); |
| 1414 | 1414 | |
| 1415 | 1415 | if ( $newid === false ) { |
| 1416 | | - $dbw->rollback(); |
| | 1416 | + $dbw->rollback( __METHOD__ ); |
| 1417 | 1417 | $status->fatal( 'edit-already-exists' ); |
| 1418 | 1418 | |
| 1419 | 1419 | wfProfileOut( __METHOD__ ); |
| — | — | @@ -1453,7 +1453,7 @@ |
| 1454 | 1454 | } |
| 1455 | 1455 | } |
| 1456 | 1456 | $user->incEditCount(); |
| 1457 | | - $dbw->commit(); |
| | 1457 | + $dbw->commit( __METHOD__ ); |
| 1458 | 1458 | |
| 1459 | 1459 | # Update links, etc. |
| 1460 | 1460 | $this->doEditUpdates( $revision, $user, array( 'created' => true ) ); |
| — | — | @@ -1985,7 +1985,7 @@ |
| 1986 | 1986 | $bitfield = 'rev_deleted'; |
| 1987 | 1987 | } |
| 1988 | 1988 | |
| 1989 | | - $dbw->begin(); |
| | 1989 | + $dbw->begin( __METHOD__ ); |
| 1990 | 1990 | // For now, shunt the revision data into the archive table. |
| 1991 | 1991 | // Text is *not* removed from the text table; bulk storage |
| 1992 | 1992 | // is left intact to avoid breaking block-compression or |
| — | — | @@ -2025,7 +2025,7 @@ |
| 2026 | 2026 | $ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy |
| 2027 | 2027 | |
| 2028 | 2028 | if ( !$ok ) { |
| 2029 | | - $dbw->rollback(); |
| | 2029 | + $dbw->rollback( __METHOD__ ); |
| 2030 | 2030 | return WikiPage::DELETE_NO_REVISIONS; |
| 2031 | 2031 | } |
| 2032 | 2032 | |
| — | — | @@ -2042,7 +2042,7 @@ |
| 2043 | 2043 | $logEntry->publish( $logid ); |
| 2044 | 2044 | |
| 2045 | 2045 | if ( $commit ) { |
| 2046 | | - $dbw->commit(); |
| | 2046 | + $dbw->commit( __METHOD__ ); |
| 2047 | 2047 | } |
| 2048 | 2048 | |
| 2049 | 2049 | wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$user, $reason, $id ) ); |