# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1485432218 -7200
# Node ID 563fc90de9657ef063a698edc791804574590a0c
# Parent  7bfa5a38b6ca8fabe89ee53b53a75f6eac70ceae
Move 'voting enabled' global setting back to general settings.

diff -r 7bfa5a38b6ca -r 563fc90de965 dbdefs.inc.php
--- a/dbdefs.inc.php	Thu Jan 26 13:56:34 2017 +0200
+++ b/dbdefs.inc.php	Thu Jan 26 14:03:38 2017 +0200
@@ -37,6 +37,8 @@
 
     "requireEMail"     => array(VT_BOOL, false, "Require e-mail address in registrations"),
     "allowRegister"    => array(VT_BOOL, false, "Enable event registration"),
+
+    "allowVoting"      => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"),
   ),
 
   "html" => array(
@@ -198,7 +200,6 @@
   // Voting
   //
   "voting" => array(
-    "allowVoting"      => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"),
 
     "voteFinishedText" => array(VT_TEXT, "
 <h1>Yay, you have voted!</h1>