https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113700
Revision: 113700
Author: wikinaut
Date: 2012-03-13 01:04:59 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
follow up r113686 . correction of algorithm for voting for the last answer,
this was wrongly treated as revoke action
Modified Paths:
--------------
trunk/extensions/AJAXPoll/AJAXPoll.php
trunk/extensions/AJAXPoll/AJAXPoll_body.php
Modified: trunk/extensions/AJAXPoll/AJAXPoll.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-13 00:42:37 UTC (rev
113699)
+++ trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-13 01:04:59 UTC (rev
113700)
@@ -19,7 +19,7 @@
* @author Jack Phoenix <[email protected]>
* @author Thomas Gries
* @maintainer Thomas Gries
- * @version 1.68
+ * @version 1.69
* @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
*/
@@ -31,7 +31,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'AJAX Poll',
- 'version' => '1.68 20120313',
+ 'version' => '1.69 20120313',
'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries'
),
'descriptionmsg' => 'ajaxpoll-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
Modified: trunk/extensions/AJAXPoll/AJAXPoll_body.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-13 00:42:37 UTC (rev
113699)
+++ trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-13 01:04:59 UTC (rev
113700)
@@ -317,9 +317,12 @@
// Different message depending on if the user has
already voted or not, or is entitled to vote
+ $canRevoke = false;
+
if ( $wgUser->isAllowed( 'ajaxpoll-vote' ) ) {
if ( isset( $row[0] ) ) {
$message = $ourLastVoteDate;
+ $canRevoke = true;
$lines[] = wfMsg(
'ajaxpoll-revoke-vote' );
} else {
$message = wfMsg( 'ajaxpoll-no-vote' );
@@ -336,8 +339,9 @@
for ( $i = 1; $i < count( $lines ); $i++ ) {
- $vote = ( $i != count( $lines ) - 1 );
+ $vote = !( $canRevoke && ( $i == count( $lines
) - 1 ) );
$voteValue = ( $vote ) ? $i : 0;
+
$ans_no = $i - 1;
if ( $amountOfVotes == 0 ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
