Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65491
Change subject: removed depreacted wfMsg; added db->begin which fixed a
database error message
......................................................................
removed depreacted wfMsg; added db->begin which fixed a database error message
version 1.792 20130526
Change-Id: I86849ed7b3e64032e6f78b0becc4a87cbface24f
---
M AJAXPoll.php
M AJAXPoll_body.php
2 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll
refs/changes/91/65491/1
diff --git a/AJAXPoll.php b/AJAXPoll.php
index de5b5da..77de0d7 100644
--- a/AJAXPoll.php
+++ b/AJAXPoll.php
@@ -31,7 +31,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'AJAX Poll',
- 'version' => '1.791 20130526',
+ 'version' => '1.792 20130526',
'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries'
),
'descriptionmsg' => 'ajaxpoll-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php
index c0217f6..bb21760 100644
--- a/AJAXPoll_body.php
+++ b/AJAXPoll_body.php
@@ -153,6 +153,7 @@
// echo "id: $id ans $answer<br/>";
$dbw = wfGetDB( DB_MASTER );
+ $dbw->begin( __METHOD__ );
if ( $wgUser->getName() == '' ) {
$userName = wfGetIP();
@@ -193,7 +194,7 @@
),
__METHOD__
);
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
$pollContainerText = ( $updateQuery ) ?
'ajaxpoll-vote-update' : 'ajaxpoll-vote-error';
} else {
@@ -209,7 +210,7 @@
),
__METHOD__
);
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
$pollContainerText = ( $insertQuery ) ?
'ajaxpoll-vote-add' : 'ajaxpoll-vote-error';
}
@@ -224,7 +225,7 @@
),
__METHOD__
);
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
$pollContainerText = ( $deleteQuery ) ?
'ajaxpoll-vote-revoked' : 'ajaxpoll-vote-error';
}
@@ -280,17 +281,17 @@
);
if ( $row = $dbr->fetchRow( $q ) ) {
- $ourLastVoteDate = wfMsg(
+ $ourLastVoteDate = wfMessage(
'ajaxpoll-your-vote',
$lines[$row[0] - 1],
$wgLang->timeanddate( wfTimestamp( TS_MW,
$row[1] ), true /* adjust? */ )
- );
+ )->escaped();
}
if ( is_object( $wgTitle ) ) {
if( !empty( $extra_from_ajax ) ) {
$attributes = ' style="display:block;"';
- $ajaxMessage = wfMsg( $extra_from_ajax );
+ $ajaxMessage = wfMessage( $extra_from_ajax
)->escaped();
} else {
$attributes = ' style="display:none;"';
$ajaxMessage = '';
@@ -310,12 +311,12 @@
if ( isset( $row[0] ) ) {
$message = $ourLastVoteDate;
$canRevoke = true;
- $lines[] = wfMsg(
'ajaxpoll-revoke-vote' );
+ $lines[] = wfMessage(
'ajaxpoll-revoke-vote' )->text();
} else {
- $message = wfMsg( 'ajaxpoll-no-vote' );
+ $message = wfMessage(
'ajaxpoll-no-vote' )->text();
}
} else {
- $message = wfMsg( 'ajaxpoll-vote-permission' );
+ $message = wfMessage(
'ajaxpoll-vote-permission' )->text();
}
$ret .= '<div class="ajaxpoll-misc">' . $message . '
@@ -355,7 +356,7 @@
if ( $vote ) {
$ret .= "
<div id='ajaxpoll-answer-$xid' class='ajaxpoll-answer' poll='$id'
answer='$answer'><div class='ajaxpoll-answer-name'><label
for='ajaxpoll-post-answer-$xid'><input type='radio'
id='ajaxpoll-post-answer-$xid' name='ajaxpoll-post-answer-$id' value='" .
$answer . "' " . ( $our ? 'checked=true ' : '' ) . "/>" . strip_tags(
$lines[$i] ) .
-"</label></div><div class='ajaxpoll-answer-vote" . ( $our ? '
ajaxpoll-our-vote' : '' ) ."'><span title='" . wfMsg( 'ajaxpoll-percent-votes',
sprintf( $percent ) ) . "'>" . ( ( isset( $poll_result ) && !empty(
$poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 ) . "</span><div
style='width: " . $percent . "%;" . ( $percent == 0 ? ' border:0;' : '' ) .
"'></div></div>
+"</label></div><div class='ajaxpoll-answer-vote" . ( $our ? '
ajaxpoll-our-vote' : '' ) ."'><span title='" . wfMessage(
'ajaxpoll-percent-votes', sprintf( $percent ) )->escaped() . "'>" . ( ( isset(
$poll_result ) && !empty( $poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 )
. "</span><div style='width: " . $percent . "%;" . ( $percent == 0 ? '
border:0;' : '' ) . "'></div></div>
</div>
";
} else {
@@ -369,8 +370,8 @@
} else {
$ret .= "
-<div id='ajaxpoll-answer-" . $xid . "' class='ajaxpoll-answer' poll='$id'
answer='$answer'><div class='ajaxpoll-answer-name'><label
for='ajaxpoll-post-answer-" . $xid . "' onclick='$(\"#ajaxpoll-ajax-" . $xid .
"\").html(\"" . wfMsg( 'ajaxpoll-vote-permission' ) .
"\").css(\"display\",\"block\");'><input disabled='disabled' type='radio'
id='ajaxpoll-post-answer-" . $xid . "' name='ajaxpoll-post-answer-" . $id . "'
value='" . $answer . "'/>" . strip_tags( $lines[$i] ) .
-"</label></div><div class='ajaxpoll-answer-vote" . ( $our ? '
ajaxpoll-our-vote' : '' ) ."'><span title='" . wfMsg( 'ajaxpoll-percent-votes',
sprintf( $percent ) ) . "'>" . ( ( isset( $poll_result ) && !empty(
$poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 ) . "</span><div
style='width: " . $percent . "%;" . ( $percent == 0 ? ' border:0;' : '' ) .
"'></div></div>
+<div id='ajaxpoll-answer-" . $xid . "' class='ajaxpoll-answer' poll='$id'
answer='$answer'><div class='ajaxpoll-answer-name'><label
for='ajaxpoll-post-answer-" . $xid . "' onclick='$(\"#ajaxpoll-ajax-" . $xid .
"\").html(\"" . wfMessage( 'ajaxpoll-vote-permission' )->text() .
"\").css(\"display\",\"block\");'><input disabled='disabled' type='radio'
id='ajaxpoll-post-answer-" . $xid . "' name='ajaxpoll-post-answer-" . $id . "'
value='" . $answer . "'/>" . strip_tags( $lines[$i] ) .
+"</label></div><div class='ajaxpoll-answer-vote" . ( $our ? '
ajaxpoll-our-vote' : '' ) ."'><span title='" . wfMessage(
'ajaxpoll-percent-votes', sprintf( $percent ) )->text() . "'>" . ( ( isset(
$poll_result ) && !empty( $poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 )
. "</span><div style='width: " . $percent . "%;" . ( $percent == 0 ? '
border:0;' : '' ) . "'></div></div>
</div>
";
}
@@ -380,12 +381,11 @@
$ret .= '</form>';
// Display information about the poll (creation date,
amount of votes)
- $pollSummary = wfMsgExt(
+ $pollSummary = wfMessage(
'ajaxpoll-info',
- 'parsemag', // parse PLURAL
$amountOfVotes, // amount of votes
$wgLang->timeanddate( wfTimestamp( TS_MW,
$start_date ), true /* adjust? */ )
- );
+ )->text();
$ret .= '<div id="ajaxpoll-info-' . $id . '"
class="ajaxpoll-info">' . $pollSummary . '<div class="ajaxpoll-id-info">poll-id
' . $id . '</div></div></div>';
} else {
--
To view, visit https://gerrit.wikimedia.org/r/65491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86849ed7b3e64032e6f78b0becc4a87cbface24f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
