| Index: trunk/extensions/Aggregator/Aggregator.php |
| — | — | @@ -229,13 +229,13 @@ |
| 230 | 230 | wfDebug( "$fname saving items from $url\n" ); |
| 231 | 231 | |
| 232 | 232 | $dbw = wfGetDB( DB_MASTER ); |
| 233 | | - $dbw->begin(); |
| | 233 | + $dbw->begin( __METHOD__ ); |
| 234 | 234 | |
| 235 | 235 | $this->clearItems( $dbw, $url ); |
| 236 | 236 | $this->insertItems( $dbw, $url, $items ); |
| 237 | 237 | $this->touchFeed( $dbw, $url ); |
| 238 | 238 | |
| 239 | | - $dbw->commit(); |
| | 239 | + $dbw->commit( __METHOD__ ); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | private function clearItems( $dbw, $url ) { |
| Index: trunk/extensions/ArchiveLinks/ArchiveLinks.class.php |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | $db_slave = wfGetDB( DB_SLAVE ); |
| 27 | 27 | $db_result = array(); |
| 28 | 28 | |
| 29 | | - $db_master->begin(); |
| | 29 | + $db_master->begin( __METHOD__ ); |
| 30 | 30 | |
| 31 | 31 | if ( !isset( $wgArchiveLinksConfig['global_rearchive_time'] ) ) { |
| 32 | 32 | //30 days or 2,592,000 seconds... |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | | - $db_master->commit(); |
| | 131 | + $db_master->commit( __METHOD__ ); |
| 132 | 132 | |
| 133 | 133 | return true; |
| 134 | 134 | } |
| Index: trunk/extensions/Quiz/Quiz.class.php |
| — | — | @@ -751,11 +751,10 @@ |
| 752 | 752 | ( array_key_exists( 3, $matches ) && $value >= $matches[1] && $value <= $matches[3] ) || |
| 753 | 753 | $value == $possibility |
| 754 | 754 | ) |
| 755 | | - ) |
| 756 | | - { |
| | 755 | + ) { |
| 757 | 756 | $state = 'right'; |
| 758 | 757 | $title = 'title="' . wfMsgHtml( 'quiz_colorRight' ) . '"'; |
| 759 | | - } else { |
| | 758 | + } else { |
| 760 | 759 | $state = 'wrong'; |
| 761 | 760 | $title = 'title="' . wfMsgHtml( 'quiz_colorWrong' ) . '"'; |
| 762 | 761 | } |
| — | — | @@ -768,8 +767,7 @@ |
| 769 | 768 | $value == $possibility || |
| 770 | 769 | ( preg_match( '`^' . $value . ' \(i\)$`i', $possibility ) ) || |
| 771 | 770 | ( !$this->mCaseSensitive && preg_match( '`^' . $value . '$`i', $possibility ) ) |
| 772 | | - ) |
| 773 | | - { |
| | 771 | + ) { |
| 774 | 772 | $state = 'right'; |
| 775 | 773 | $title = 'title="' . wfMsgHtml( 'quiz_colorRight' ) . '"'; |
| 776 | 774 | } else { |
| Index: trunk/extensions/NewUserMessage/NewUserMessage.class.php |
| — | — | @@ -227,7 +227,7 @@ |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | $dbw = wfGetDB( DB_MASTER ); |
| 231 | | - $dbw->begin(); |
| | 231 | + $dbw->begin( __METHOD__ ); |
| 232 | 232 | |
| 233 | 233 | try { |
| 234 | 234 | $status = $article->doEdit( $text, $summary, $flags, false, $editor ); |
| — | — | @@ -242,7 +242,7 @@ |
| 243 | 243 | } else { |
| 244 | 244 | // The article was concurrently created |
| 245 | 245 | wfDebug( __METHOD__ . ": Error ".$status->getWikiText() ); |
| 246 | | - $dbw->rollback(); |
| | 246 | + $dbw->rollback( __METHOD__ ); |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | return $status->isGood(); |
| Index: trunk/extensions/AJAXPoll/AJAXPoll_body.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | }*/ |
| 55 | 55 | |
| 56 | 56 | $dbw = wfGetDB( DB_MASTER ); |
| 57 | | - $dbw->begin(); |
| | 57 | + $dbw->begin( __METHOD__ ); |
| 58 | 58 | /** |
| 59 | 59 | * Register poll in the database |
| 60 | 60 | */ |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | __METHOD__ |
| 78 | 78 | ); |
| 79 | 79 | } |
| 80 | | - $dbw->commit(); |
| | 80 | + $dbw->commit( __METHOD__ ); |
| 81 | 81 | |
| 82 | 82 | // Add CSS |
| 83 | 83 | $wgOut->addExtensionStyle( $wgScriptPath . '/extensions/AJAXPoll/AJAXPoll.css' ); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | $newRow['af_user'] = $user->getId(); |
| 118 | 118 | $newRow['af_user_text'] = $user->getName(); |
| 119 | 119 | |
| 120 | | - $dbw->begin(); |
| | 120 | + $dbw->begin( __METHOD__ ); |
| 121 | 121 | |
| 122 | 122 | // Insert MAIN row. |
| 123 | 123 | if ( $filter == 'new' ) { |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | } |
| 209 | 209 | $dbw->insert( 'abuse_filter_action', $actionsRows, __METHOD__ ); |
| 210 | 210 | |
| 211 | | - $dbw->commit(); |
| | 211 | + $dbw->commit( __METHOD__ ); |
| 212 | 212 | |
| 213 | 213 | // Logging |
| 214 | 214 | |