arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

temporarily set the fairyear in install3 so user_create works?

Browse Source
This commit is contained in:
james 2010-07-05 20:36:40 +00:00
parent 548ebf24db
commit 75c806bf7e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config_editor.inc.php
View File

@ -85,7 +85,7 @@ function config_update_variables($conference_id=NULL, $last_conference_id=NULL)
if($conference_id == NULL && $last_conference_id==NULL) { if($conference_id == NULL && $last_conference_id==NULL) {
//FIXME: what the heck do we do? //FIXME: what the heck do we do?
} }
else { else if($conference_id) {
// if($lastfairyear == NULL) $lastfairyear = $fairyear - 1; // if($lastfairyear == NULL) $lastfairyear = $fairyear - 1;
/* The master list of variables is the year=-1, grab /* 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)."')"); '".mysql_escape_string($v->conferencetypes)."')");
} }
} }
else {
//umm?
}
} }
$config_editor_actions_done = false; $config_editor_actions_done = false;

3
install3.php
View File

@ -104,9 +104,10 @@ if($_POST['action']=="save") {
mysql_query("INSERT INTO config (var,val,category,ord,year) VALUES ('SFIABDIRECTORY','".$_POST['sfiabdirectory']."','Special','','0')"); mysql_query("INSERT INTO config (var,val,category,ord,year) VALUES ('SFIABDIRECTORY','".$_POST['sfiabdirectory']."','Special','','0')");
$year = intval($_POST['fairyear']); $year = intval($_POST['fairyear']);
$config['FAIRYEAR']=$year;
//copy over the config defautls //copy over the config defautls
config_update_variables($year); // config_update_variables($year);
// Update some variables // Update some variables
mysql_query("UPDATE config SET mysql_query("UPDATE config SET