merging 5.5.6. changes

This commit is contained in:
JT Smith 2004-04-11 20:46:37 +00:00
parent dc41a0c9ae
commit a8c39c01c1
10 changed files with 63 additions and 20 deletions

View file

@ -407,6 +407,11 @@ sub open {
$session{config}{extrasURL} = $session{config}{extrasURL} || $session{config}{extras} || "/extras";
$session{config}{extras} = $session{config}{extras} || $session{config}{extrasURL}; # for backward compatibility
$session{config}{extrasPath} = $session{config}{extrasPath} || "/data/WebGUI/www/extras";
if (ref $session{config}{sitename} eq "ARRAY") {
$session{config}{defaultSitename} = $session{config}{sitename}[0];
} else {
$session{config}{defaultSitename} = $session{config}{sitename};
}
###----------------------------
### default database handler object
$session{dbh} = DBI->connect($session{config}{dsn},$session{config}{dbuser},$session{config}{dbpass},{ RaiseError=>0,AutoCommit=>1 });