aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-25 22:03:02 -0700
committerredmatrix <git@macgirvin.com>2016-04-25 22:03:02 -0700
commit2e7028c976023ebf5c03bfaaad9f91be8a01e932 (patch)
tree836aba8d73f5120bcdb613026577ff72ef198e6a
parent78e4b64c8bbc85082eb4b589a1ff5cd796d695c9 (diff)
downloadvolse-hubzilla-2e7028c976023ebf5c03bfaaad9f91be8a01e932.tar.gz
volse-hubzilla-2e7028c976023ebf5c03bfaaad9f91be8a01e932.tar.bz2
volse-hubzilla-2e7028c976023ebf5c03bfaaad9f91be8a01e932.zip
some cleanup on the mysqli driver
-rwxr-xr-xinclude/dba/dba_mysqli.php18
1 files changed, 12 insertions, 6 deletions
diff --git a/include/dba/dba_mysqli.php b/include/dba/dba_mysqli.php
index 6986d4586..57a7559a1 100755
--- a/include/dba/dba_mysqli.php
+++ b/include/dba/dba_mysqli.php
@@ -4,20 +4,26 @@ require_once('include/dba/dba_driver.php');
class dba_mysqli extends dba_driver {
- function connect($server, $port, $user,$pass,$db) {
+ function connect($server,$port,$user,$pass,$db) {
if($port)
$this->db = new mysqli($server,$user,$pass,$db, $port);
else
$this->db = new mysqli($server,$user,$pass,$db);
- if(! mysqli_connect_errno()) {
- $this->connected = true;
+ if($this->db->connect_error) {
+ $this->connected = false;
+ $this->error = $this->db->connect_error;
+
+ if(file_exists('dbfail.out')) {
+ file_put_contents('dbfail.out', datetime_convert() . "\nConnect: " . $this->error . "\n", FILE_APPEND);
+ }
+
+ return false;
}
- if($this->connected) {
+ else {
+ $this->connected = true;
return true;
}
- $this->error = $this->db->connect_error;
- return false;
}
function q($sql) {