From 7eb4ad1ecc62d989af8967dd357b92d15bd47000 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Fri, 11 Jan 2008 21:36:25 +0000
Subject: [PATCH] Fix install3 after dave's commit of the tour assigner config
 values as default year=0 The install3 script detects an 'existing' install vs
 a 'fresh' install by checking for config entries with year=0... originally it
 expected only one DBVERSION and if any others existed then this must not be a
 fresh install, but now since things exist there, we need to forcefully check
 only the vars we're looking for.

---
 install3.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install3.php b/install3.php
index f8868b5..a89bd29 100644
--- a/install3.php
+++ b/install3.php
@@ -59,7 +59,7 @@ mysql_select_db($DBNAME);
 		}
 
 //a fresh install should ONLY have DBVERSION defined in the config table.  If there are others (FAIRYEAR, SFIABDIRECTORY) then this is NOT fresh
-$q=mysql_query("SELECT * FROM config WHERE year='0'");
+$q=mysql_query("SELECT * FROM config WHERE year='0' AND ( var='DBVERSION' OR var='FAIRYEAR' OR var='SFIABDIRECTORY') ");
 //we might get an error if the config table does not exist (ie, installer step 2 failed)
 if(mysql_error())
 {