Index: polls/impl/src/java/org/sakaiproject/poll/service/impl/PollVoteManagerImpl.java
===================================================================
--- polls/impl/src/java/org/sakaiproject/poll/service/impl/PollVoteManagerImpl.java	(revisión: 106881)
+++ polls/impl/src/java/org/sakaiproject/poll/service/impl/PollVoteManagerImpl.java	(revisión: 106882)
@@ -219,6 +219,14 @@
 
 		if (pollAfterOpen && pollBeforeClose)
 		{
+			if (externalLogic.isUserAdmin())
+				return true;
+			if (externalLogic.isAllowedInLocation(PollListManager.PERMISSION_EDIT_ANY, externalLogic.getCurrentLocationReference()))
+				return true;
+			if (externalLogic.isAllowedInLocation(PollListManager.PERMISSION_EDIT_OWN, externalLogic.getCurrentLocationReference())
+					&& poll.getOwner().equals(externalLogic.getCurrentUserId()))
+				return true;
+					
 			if (poll.getLimitVoting() && userHasVoted(poll.getPollId())) {
 				return false;
 			}
Index: polls/tool/src/java/org/sakaiproject/poll/tool/producers/PollVoteProducer.java
===================================================================
--- polls/tool/src/java/org/sakaiproject/poll/tool/producers/PollVoteProducer.java	(revisión: 106881)
+++ polls/tool/src/java/org/sakaiproject/poll/tool/producers/PollVoteProducer.java	(revisión: 106882)
@@ -123,14 +123,6 @@
 
 		LOG.debug("got poll " + poll.getText());
 
-
-		//check if they can vote
-		if (poll.getLimitVoting() && pollVoteManager.userHasVoted(poll.getPollId())) {
-			LOG.warn("This user has already voted!");
-			UIOutput.make(tofill, "hasErrors",messageLocator.getMessage("vote_hasvoted"));
-			return;
-		}
-
 		UIOutput.make(tofill,"poll-text",poll.getText());
 		if (poll.getDetails() != null)
 		{
Index: polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages.properties
===================================================================
--- polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages.properties	(revisión: 106881)
+++ polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages.properties	(revisión: 106882)
@@ -66,6 +66,7 @@
 delete_option_email_body=The poll option you voted for in the site ''{1}'' has been deleted by a poll maintainer. The poll question is:<br /><br />{2}<br /><br />Please log in and place a new vote for the poll.
 
 vote_hasvoted=You have already voted!
+vote_hasvoted.voteCollection=You have already voted!
 vote_cancel=Cancel
 vote_closed=This poll is closed for voting!
 vote_noperm=You are not allowed to vote in this poll
Index: polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_ca.properties
===================================================================
--- polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_ca.properties	(revisión: 106881)
+++ polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_ca.properties	(revisión: 106882)
@@ -218,6 +218,8 @@
 
 vote_hasvoted = Ja heu votat.
 
+vote_hasvoted.voteCollection = Ja heu votat.
+
 vote_noperm = No teniu perm\u00EDs per votar en aquesta enquesta
 
 vote_reset = Reinicia
Index: polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_es.properties
===================================================================
--- polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_es.properties	(revisión: 106881)
+++ polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_es.properties	(revisión: 106882)
@@ -76,6 +76,7 @@
 vote_cancel=Cancelar
 vote_closed=\u00A1Esta encuestra se ha cerrado al voto\!
 vote_hasvoted=\u00A1Ya ha votado\!
+vote_hasvoted.voteCollection=\\u00A1Ya ha votado\!
 vote_noperm=No tiene permisos para votar en este sondeo
 vote_reset=Limpiar
 vote_vote=\u00A1Vota\!