https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112698
Revision: 112698
Author: reedy
Date: 2012-02-29 15:36:10 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Add some more __METHOD__
Modified Paths:
--------------
trunk/extensions/AJAXPoll/AJAXPoll_body.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
trunk/extensions/Aggregator/Aggregator.php
trunk/extensions/ArchiveLinks/ArchiveLinks.class.php
trunk/extensions/NewUserMessage/NewUserMessage.class.php
trunk/extensions/Quiz/Quiz.class.php
Modified: trunk/extensions/AJAXPoll/AJAXPoll_body.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-02-29 15:34:17 UTC (rev
112697)
+++ trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-02-29 15:36:10 UTC (rev
112698)
@@ -53,7 +53,7 @@
}*/
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
+ $dbw->begin( __METHOD__ );
/**
* Register poll in the database
*/
@@ -76,7 +76,7 @@
__METHOD__
);
}
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
// Add CSS
$wgOut->addExtensionStyle( $wgScriptPath .
'/extensions/AJAXPoll/AJAXPoll.css' );
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php 2012-02-29
15:34:17 UTC (rev 112697)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php 2012-02-29
15:36:10 UTC (rev 112698)
@@ -116,7 +116,7 @@
$newRow['af_user'] = $user->getId();
$newRow['af_user_text'] = $user->getName();
- $dbw->begin();
+ $dbw->begin( __METHOD__ );
// Insert MAIN row.
if ( $filter == 'new' ) {
@@ -207,7 +207,7 @@
}
$dbw->insert( 'abuse_filter_action', $actionsRows,
__METHOD__ );
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
// Logging
Modified: trunk/extensions/Aggregator/Aggregator.php
===================================================================
--- trunk/extensions/Aggregator/Aggregator.php 2012-02-29 15:34:17 UTC (rev
112697)
+++ trunk/extensions/Aggregator/Aggregator.php 2012-02-29 15:36:10 UTC (rev
112698)
@@ -229,13 +229,13 @@
wfDebug( "$fname saving items from $url\n" );
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
+ $dbw->begin( __METHOD__ );
$this->clearItems( $dbw, $url );
$this->insertItems( $dbw, $url, $items );
$this->touchFeed( $dbw, $url );
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
}
private function clearItems( $dbw, $url ) {
Modified: trunk/extensions/ArchiveLinks/ArchiveLinks.class.php
===================================================================
--- trunk/extensions/ArchiveLinks/ArchiveLinks.class.php 2012-02-29
15:34:17 UTC (rev 112697)
+++ trunk/extensions/ArchiveLinks/ArchiveLinks.class.php 2012-02-29
15:36:10 UTC (rev 112698)
@@ -25,7 +25,7 @@
$db_slave = wfGetDB( DB_SLAVE );
$db_result = array();
- $db_master->begin();
+ $db_master->begin( __METHOD__ );
if ( !isset( $wgArchiveLinksConfig['global_rearchive_time'] ) )
{
//30 days or 2,592,000 seconds...
@@ -127,7 +127,7 @@
}
}
- $db_master->commit();
+ $db_master->commit( __METHOD__ );
return true;
}
Modified: trunk/extensions/NewUserMessage/NewUserMessage.class.php
===================================================================
--- trunk/extensions/NewUserMessage/NewUserMessage.class.php 2012-02-29
15:34:17 UTC (rev 112697)
+++ trunk/extensions/NewUserMessage/NewUserMessage.class.php 2012-02-29
15:36:10 UTC (rev 112698)
@@ -227,7 +227,7 @@
}
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
+ $dbw->begin( __METHOD__ );
try {
$status = $article->doEdit( $text, $summary, $flags,
false, $editor );
@@ -242,7 +242,7 @@
} else {
// The article was concurrently created
wfDebug( __METHOD__ . ": Error ".$status->getWikiText()
);
- $dbw->rollback();
+ $dbw->rollback( __METHOD__ );
}
return $status->isGood();
Modified: trunk/extensions/Quiz/Quiz.class.php
===================================================================
--- trunk/extensions/Quiz/Quiz.class.php 2012-02-29 15:34:17 UTC (rev
112697)
+++ trunk/extensions/Quiz/Quiz.class.php 2012-02-29 15:36:10 UTC (rev
112698)
@@ -751,11 +751,10 @@
(
array_key_exists( 3, $matches ) && $value >= $matches[1] && $value <=
$matches[3] ) ||
$value
== $possibility
)
- )
- {
+ ) {
$state =
'right';
$title =
'title="' . wfMsgHtml( 'quiz_colorRight' ) . '"';
- } else {
+ } else {
$state =
'wrong';
$title =
'title="' . wfMsgHtml( 'quiz_colorWrong' ) . '"';
}
@@ -768,8 +767,7 @@
$value ==
$possibility ||
( preg_match(
'`^' . $value . ' \(i\)$`i', $possibility ) ) ||
(
!$this->mCaseSensitive && preg_match( '`^' . $value . '$`i', $possibility ) )
- )
- {
+ ) {
$state =
'right';
$title =
'title="' . wfMsgHtml( 'quiz_colorRight' ) . '"';
} else {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
