Fixed a little bug in the installer, which was missing to save the DBType for MYSQL Datasource.

This isn't really an issue as the DBTYPE can only be MYSQL for this Source.
However it caused an unnecessary NOTICE issue when debugging was enabled.
This commit is contained in:
Andre Lorbach 2008-07-17 11:25:34 +02:00
parent 336923f134
commit 3f0d45efe9
2 changed files with 10 additions and 1 deletions

View File

@ -102,7 +102,12 @@
$content['Sources'][$iSourceID]['ObjRef'] = new LogStreamConfigDB();
$content['Sources'][$iSourceID]['ObjRef']->DBServer = $mysource['DBServer'];
$content['Sources'][$iSourceID]['ObjRef']->DBName = $mysource['DBName'];
$content['Sources'][$iSourceID]['ObjRef']->DBType = $mysource['DBType'];
// Workaround a little bug from the installer script
if ( isset($mysource['DBType']) )
$content['Sources'][$iSourceID]['ObjRef']->DBType = $mysource['DBType'];
else
$content['Sources'][$iSourceID]['ObjRef']->DBType = DB_MYSQL;
$content['Sources'][$iSourceID]['ObjRef']->DBTableName = $mysource['DBTableName'];
// Legacy handling for tabletype!

View File

@ -644,8 +644,12 @@ else if ( $content['INSTALL_STEP'] == 8 )
}
else if ( $_SESSION['SourceType'] == SOURCE_DB )
{
// Need to create the LIST first!
CreateDBTypesList($_SESSION['SourceDBType']);
$firstsource .= "\$CFG['Sources']['Source1']['SourceType'] = SOURCE_DB;\n" .
"\$CFG['Sources']['Source1']['DBTableType'] = '" . $_SESSION['SourceDBTableType'] . "';\n" .
"\$CFG['Sources']['Source1']['DBType'] = " . $content['DBTYPES'][$_SESSION['SourceDBType']]['typeastext'] . ";\n" .
"\$CFG['Sources']['Source1']['DBServer'] = '" . $_SESSION['SourceDBServer'] . "';\n" .
"\$CFG['Sources']['Source1']['DBName'] = '" . $_SESSION['SourceDBName'] . "';\n" .
"\$CFG['Sources']['Source1']['DBUser'] = '" . $_SESSION['SourceDBUser'] . "';\n" .