Show
Ignore:
Timestamp:
12/23/07 22:25:28 (1 year ago)
Author:
misja
Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1476, r1477, r1478, r1479, r1480, r1481, r1482, r1483, r1484, r1485, r1486, r1487, r1488, r1489 into 0.9 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/0.9/install.php

    r1473 r1490  
    541541    require_once($CFG->dirroot.'lib/adodb/adodb.inc.php'); 
    542542 
    543     $db = &ADONewConnection($CFG->dbtype); 
    544     $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; 
    545  
    546     $result = @$db->Connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname); 
    547  
    548     if (!$result) { 
    549         unset($db); 
     543    if (empty($CFG->dbhost) || empty($CFG->dbuser) || empty($CFG->dbname)) { 
     544        $result = false; 
     545    } else { 
     546        $db = &ADONewConnection($CFG->dbtype); 
     547        $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; 
     548 
     549        $result = @$db->Connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname); 
     550 
     551        if (!$result) { 
     552            unset($db); 
     553        } 
    550554    } 
    551555