Changeset 263

Timestamp:

Jun 7, 2017, 8:03:25 PM (7 years ago)

Author:

roby

Message:

correzioni alla revisione 259

Location:

trunk

Files:

• admin/modules/Elezioni/ele_voti.php (modified) (1 diff)
• admin/versione.php (modified) (1 diff)
• client/versione.php (modified) (1 diff)

trunk/admin/modules/Elezioni/ele_voti.php

@@ -231 +231 @@
                                                         if($res4) list($testpref)=mysql_fetch_row($res4); else $testpref=0;
                                                         while(list($testlista)=mysql_fetch_row($res3)){
-                                                                if($fascia<=$limite or $disgiunto or $dettnulli)
+                                                                if($fascia<=$limite and !$disgiunto and !$dettnulli)
                                                                 {
                                                                         $res4= mysql_query("SELECT id_gruppo FROM ".$prefix."_ele_lista where id_cons='$id_cons' and id_lista='$testlista'", $dbi);

trunk/admin/versione.php

@@ -1 +1 @@
 <?php
 
+<<<<<<< .mine
+$versione = "2.0 rev 263";
+=======
 $versione = "2.0 rev 262";
+>>>>>>> .r262
 $version_number = $versione;
+<<<<<<< .mine
+$version = "Eleonline $version_number (<i>Data Release: 7 giugno 2017</i>)";
+=======
 $version = "Eleonline $version_number (<i>Data Release: 31 maggio 2017</i>)";
+>>>>>>> .r262
 
 ?> 

trunk/client/versione.php

@@ -1 +1 @@
 <?php
 
+<<<<<<< .mine
+$versione = "2.0 rev 263";
+=======
 $versione = "2.0 rev 262";
+>>>>>>> .r262
 $version_number = $versione;
+<<<<<<< .mine
+$version = "Eleonline $version_number (<i>Data Release: 7 giugno 2017</i>)";
+=======
 $version = "Eleonline $version_number (<i>Data Release: 31 maggio 2017</i>)";
+>>>>>>> .r262