2.1.2 Final Prep

geoffhumphrey · May 24, 2016 · 553b299 · 553b299
1 parent d344deb
commit 553b299
Show file tree

Hide file tree

Showing 11 changed files with 3,389 additions and 3,367 deletions.
diff --git a/admin/dropoff.admin.php b/admin/dropoff.admin.php
@@ -1,4 +1,6 @@
 <?php include(DB.'dropoff.db.php'); 
+$dropoff_loc_url_yes = "";
+$dropoff_loc_url_no = "";
 if ($_SESSION['brewerCountry'] == "United States") $us_phone = TRUE; else $us_phone = FALSE;
 if ($section != "step6") {
 ?>

diff --git a/admin/judging_locations.admin.php b/admin/judging_locations.admin.php
@@ -63,6 +63,8 @@
 $form_submit_button = "";
 $output_no_records = "";
 $goto_nav = "";
+$judge_loc_url_yes = "";
+$judge_loc_url_no = "";
 
 
 if ($filter == "judges") 	$staff_row_field = "staff_judge";

diff --git a/includes/constants.inc.php b/includes/constants.inc.php
@@ -71,6 +71,8 @@
 
 	$current_date = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "date");
 	$current_time = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "time");
+
+	$delay = $_SESSION['prefsWinnerDelay'] * 3600;
 
 }
 

diff --git a/includes/current_version.inc.php b/includes/current_version.inc.php
@@ -1,6 +1,6 @@
 <?php 
 // This file will be deprecated after the release of version 1.2.1.0
 // Version information will be stored in the system table starting with version 1.2.1.0
-$current_version = "2.1.1.0";
-$current_version_display = "2.1.1";
+$current_version = "2.1.2.0";
+$current_version_display = "2.1.2";
 ?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,8 @@ @@
     	$current_date = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "date");
     	$current_time = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "time");
+    	$delay = $_SESSION['prefsWinnerDelay'] * 3600;
     }
@@ Expand Down @@