Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 05:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

start on bug #227 - more to do

Browse source
This commit is contained in:
friendica 2011-11-25 22:41:50 -08:00
parent 6b93324c11
commit 0f4a42f550
4 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/dba.php
View file

@ -36,11 +36,19 @@ class dba {
}
}
$this->db = @new mysqli($server,$user,$pass,$db);
if(! mysqli_connect_errno()) {
$this->connected = true;
if(class_exists('mysqli')) {
$this->db = @new mysqli($server,$user,$pass,$db);
if(! mysqli_connect_errno()) {
$this->connected = true;
}
}
else {
$this->db = mysql_connect($server,$user,$pass);
if($this->db && mysql_select_db($db,$this->db)) {
$this->connected = true;
}
}
if(! $this->connected) {
$this->db = null;
if(! $install)
system_unavailable();
@ -56,14 +64,19 @@ class dba {
if((! $this->db) || (! $this->connected))
return false;
$result = @$this->db->query($sql);
if(class_exists('mysqli'))
$result = @$this->db->query($sql);
else
$result = @mysql_query($sql,$this->db);
if($this->debug) {
$mesg = '';
if($this->db->errno)
if(class_exists('mysqli') && $this->db->errno)
logger('dba: ' . $this->db->error);
else
logger('dba: ' . mysql_error($this->db));
if($result === false)
$mesg = 'false';