diff --git a/config_editor.inc.php b/config_editor.inc.php index 60c7a10..cc10c5c 100644 --- a/config_editor.inc.php +++ b/config_editor.inc.php @@ -85,7 +85,7 @@ function config_update_variables($conference_id=NULL, $last_conference_id=NULL) if($conference_id == NULL && $last_conference_id==NULL) { //FIXME: what the heck do we do? } - else { + else if($conference_id) { // if($lastfairyear == NULL) $lastfairyear = $fairyear - 1; /* The master list of variables is the year=-1, grab @@ -126,6 +126,9 @@ function config_update_variables($conference_id=NULL, $last_conference_id=NULL) '".mysql_escape_string($v->conferencetypes)."')"); } } + else { + //umm? + } } $config_editor_actions_done = false; diff --git a/install3.php b/install3.php index 7c085e4..15b2352 100644 --- a/install3.php +++ b/install3.php @@ -104,9 +104,10 @@ if($_POST['action']=="save") { mysql_query("INSERT INTO config (var,val,category,ord,year) VALUES ('SFIABDIRECTORY','".$_POST['sfiabdirectory']."','Special','','0')"); $year = intval($_POST['fairyear']); + $config['FAIRYEAR']=$year; //copy over the config defautls - config_update_variables($year); +// config_update_variables($year); // Update some variables mysql_query("UPDATE config SET