[Libreoffice-commits] voting.git: configure.in vote/include

Miklos Vajna vmiklos at collabora.co.uk
Mon Dec 4 13:46:37 UTC 2017


 configure.in                  |    4 ++--
 vote/include/step4-commit.php |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9cc8d6505c546b9f7b8457bba723612b29d0a418
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Dec 4 13:44:22 2017 +0000

    Silence automake and php warnings

diff --git a/configure.in b/configure.in
index 7de36f7..14e038c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
-AC_INIT
-AM_INIT_AUTOMAKE(foundation-web, 0.1)
+AC_INIT(foundation-web, 0.1)
+AM_INIT_AUTOMAKE([foreign])
 
 AC_ARG_WITH(http_prefix, [  --with-http-prefix=DISTRIBUTOR  Specify http prefix for local testing, such as http://localhost/~user/gnomesites/])
 
diff --git a/vote/include/step4-commit.php b/vote/include/step4-commit.php
index 384b2b6..c68d423 100644
--- a/vote/include/step4-commit.php
+++ b/vote/include/step4-commit.php
@@ -38,7 +38,7 @@ function basic_vote_validation($votes_array) {
   $votes_set=array();
   foreach($votes_array as $vote) {
     // should probably check here again if the vote is still in the valid range
-    if($votes_set[$vote] === true) {
+    if(isset($votes_set[$vote]) && $votes_set[$vote] === true) {
       $error .= "preference for $vote cast twice. <br />\n";
       return false;
     }


More information about the Libreoffice-commits mailing list