Changeset 1484

Show
Ignore:
Timestamp:
12/21/07 00:12:03 (8 months ago)
Author:
rho
Message:

Workaround for weird behavior on some systems

Checking db connection with empty dbuse and dbpass
return not null value

Signed-off: Rolando Espinoza La fuente <rho@prosoftpeople.com>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/install.php

    r1469 r1484  
    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