cvs: pearweb /include/election pear-voter.php

cellog          Fri May 25 23:58:08 2007 UTC

  Modified files:              
    /pearweb/include/election   pear-voter.php 
  Log:
  fix pending election code
  
http://cvs.php.net/viewvc.cgi/pearweb/include/election/pear-voter.php?r1=1.8&r2=1.9&diff_format=u
Index: pearweb/include/election/pear-voter.php
diff -u pearweb/include/election/pear-voter.php:1.8 
pearweb/include/election/pear-voter.php:1.9
--- pearweb/include/election/pear-voter.php:1.8 Tue May  1 12:42:19 2007
+++ pearweb/include/election/pear-voter.php     Fri May 25 23:58:08 2007
@@ -245,7 +245,8 @@
     function pendingElection($id)
     {
         $info = $this->electionInfo($id);
-        if (strtotime($info['votestart']) - time() > 0) {
+        if (strtotime($info['votestart']) - time() > 0 &&
+              time() - strtotime($info['voteend']) > 0) {
             // election is not active
             return true;
         }

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php