Wikinaut has submitted this change and it was merged.
Change subject: maintenance fix: version 1.791
......................................................................
maintenance fix: version 1.791
changed variable name $user to $userName to make that clear
Change-Id: I02fe6485076fe24bbc64c3228764654c06f9aed4
---
M AJAXPoll.php
M AJAXPoll_body.php
2 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
diff --git a/AJAXPoll.php b/AJAXPoll.php
index 9b67fb2..de5b5da 100644
--- a/AJAXPoll.php
+++ b/AJAXPoll.php
@@ -31,7 +31,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'AJAX Poll',
- 'version' => '1.79 20130101',
+ 'version' => '1.791 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 ebee2b2..c0217f6 100644
--- a/AJAXPoll_body.php
+++ b/AJAXPoll_body.php
@@ -36,9 +36,9 @@
$parser->addTrackingCategory( 'ajaxpoll-tracking-category' );
if ( $wgUser->getName() == '' ) {
- $user = wfGetIP();
+ $userName = wfGetIP();
} else {
- $user = $wgUser->getName();
+ $userName = $wgUser->getName();
}
// ID of the poll
@@ -88,17 +88,17 @@
switch( $lines[0] ) {
case 'STATS':
- $retVal = AJAXPoll::buildStats( $id, $user );
+ $retVal = AJAXPoll::buildStats( $id, $userName
);
break;
default:
$retVal = '
-<div id="ajaxpoll-container-' . $id . '">' . AJAXPoll::buildHTML( $id, $user,
$lines ) . '</div>';
+<div id="ajaxpoll-container-' . $id . '">' . AJAXPoll::buildHTML( $id,
$userName, $lines ) . '</div>';
break;
}
return $retVal;
}
- private static function buildStats( $id, $user ) {
+ private static function buildStats( $id, $userName ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -155,13 +155,13 @@
$dbw = wfGetDB( DB_MASTER );
if ( $wgUser->getName() == '' ) {
- $user = wfGetIP();
+ $userName = wfGetIP();
} else {
- $user = $wgUser->getName();
+ $userName = $wgUser->getName();
}
if ( !$wgUser->isAllowed( 'ajaxpoll-vote' ) ||
$wgUser->isAllowed( 'bot' ) ) {
- return AJAXPoll::buildHTML( $id, $user );
+ return AJAXPoll::buildHTML( $id, $userName );
}
if ( $answer != 0 ) {
@@ -173,7 +173,7 @@
'COUNT(*) AS count',
array(
'poll_id' => $id,
- 'poll_user' => $user
+ 'poll_user' => $userName
),
__METHOD__
);
@@ -189,7 +189,7 @@
),
array(
'poll_id' => $id,
- 'poll_user' => $user,
+ 'poll_user' => $userName,
),
__METHOD__
);
@@ -202,7 +202,7 @@
'ajaxpoll_vote',
array(
'poll_id' => $id,
- 'poll_user' => $user,
+ 'poll_user' => $userName,
'poll_ip' => wfGetIP(),
'poll_answer' => $answer,
'poll_date' => wfTimestampNow()
@@ -220,7 +220,7 @@
'ajaxpoll_vote',
array(
'poll_id' => $id,
- 'poll_user' => $user,
+ 'poll_user' => $userName,
),
__METHOD__
);
@@ -229,11 +229,11 @@
}
- return AJAXPoll::buildHTML( $id, $user, '', $pollContainerText
);
+ return AJAXPoll::buildHTML( $id, $userName, '',
$pollContainerText );
}
- private static function buildHTML( $id, $user, $lines = '',
$extra_from_ajax = '' ) {
+ private static function buildHTML( $id, $userName, $lines = '',
$extra_from_ajax = '' ) {
global $wgTitle, $wgUser, $wgLang, $wgUseAjax;
$dbr = wfGetDB( DB_SLAVE );
@@ -274,7 +274,7 @@
array( 'poll_answer', 'poll_date' ),
array(
'poll_id' => $id,
- 'poll_user' => $user
+ 'poll_user' => $userName
),
__METHOD__
);
--
To view, visit https://gerrit.wikimedia.org/r/65488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02fe6485076fe24bbc64c3228764654c06f9aed4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: Wikinaut <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
