diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-20 16:21:15 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-20 16:21:15 -0700 |
| commit | 29340152b6a924a27dc62363d623e3dd287b5a2a (patch) | |
| tree | d73a38149dbfc3f1bde3d1e14996556190e13958 | |
| parent | 8a34f7ca7b446be390153d805965bf4cd0501b3d (diff) | |
| download | volse-hubzilla-29340152b6a924a27dc62363d623e3dd287b5a2a.tar.gz volse-hubzilla-29340152b6a924a27dc62363d623e3dd287b5a2a.tar.bz2 volse-hubzilla-29340152b6a924a27dc62363d623e3dd287b5a2a.zip | |
pdo - cleanup
| -rwxr-xr-x | include/dba/dba_driver.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index abbacc56e..e8c79045b 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -53,8 +53,6 @@ class DBA { self::$tquot = '"'; self::$scheme = 'pgsql'; -// require_once('include/dba/dba_postgres.php'); -// self::$dba = new dba_postgres($server, self::$scheme, $port, $user, $pass, $db, $install); } else { if(!($port)) @@ -63,14 +61,12 @@ class DBA { $server = '127.0.0.1'; } - require_once('include/dba/dba_pdo.php'); - self::$dba = new dba_pdo($server,self::$scheme,$port,$user,$pass,$db,$install); + require_once('include/dba/dba_pdo.php'); + self::$dba = new dba_pdo($server,self::$scheme,$port,$user,$pass,$db,$install); - - if(is_object(self::$dba) && self::$dba->connected) { - $dns = ((self::$dbtype == DBTYPE_POSTGRES) ? 'postgres' : 'mysql') + $dns = ((self::$dbtype == DBTYPE_POSTGRES) ? 'pgsql' : 'mysql') . ':host=' . $server . (is_null($port) ? '' : ';port=' . $port) . ';dbname=' . $db; self::$dba->pdo_set(array($dns,$user,$pass)); |