# HG changeset patch
# User jbe
# Date 1263380400 -3600
# Node ID 6f6ec6b5eee95f555501931f723899899f0be481
# Parent  ac7836ac00d9748055d7fa731d25048ce162d1f1
Version beta16

Critical bug related to revoked initiatives fixed, which caused lf_update or check_everything() to exit with an error instead of performing the neccessary tasks

diff -r ac7836ac00d9 -r 6f6ec6b5eee9 core.sql
--- a/core.sql	Sun Jan 10 12:00:00 2010 +0100
+++ b/core.sql	Wed Jan 13 12:00:00 2010 +0100
@@ -6,7 +6,7 @@
 BEGIN;
 
 CREATE VIEW "liquid_feedback_version" AS
-  SELECT * FROM (VALUES ('beta15', NULL, NULL, NULL))
+  SELECT * FROM (VALUES ('beta16', NULL, NULL, NULL))
   AS "subquery"("string", "major", "minor", "revision");
 
 
@@ -2152,10 +2152,10 @@
         "fully_frozen" = now()
         WHERE "id" = "issue_id_p";
       FOR "initiative_row" IN
-        SELECT * FROM "initiative" WHERE "issue_id" = "issue_id_p"
+        SELECT * FROM "initiative"
+        WHERE "issue_id" = "issue_id_p" AND "revoked" ISNULL
       LOOP
         IF
-          "initiative_row"."revoked" ISNULL AND
           "initiative_row"."satisfied_supporter_count" > 0 AND
           "initiative_row"."satisfied_supporter_count" *
           "policy_row"."initiative_quorum_den" >=
@@ -2408,7 +2408,7 @@
               ON "vote"."initiative_id" = "initiative"."id"
               AND "vote"."member_id" = "direct_voter"."member_id"
             WHERE "initiative"."issue_id" = "issue_id_p"
-            AND "initiative"."admitted"
+            AND "initiative"."admitted"  -- NOTE: NULL case is handled too
             GROUP BY "initiative"."id"
           ) AS "vote_counts",
           "issue",