aboutsummaryrefslogtreecommitdiffstats
path: root/include/dba
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-05-15 22:27:35 -0700
committerfriendica <info@friendica.com>2013-05-15 22:27:35 -0700
commitd20a0cb6abe92e05f4387a6b3ad504b422275fb1 (patch)
tree386e650aa46efd8d60885b3d6e9083727080adc4 /include/dba
parentb00c900fa2d999657b17caf577acea5ab772dec1 (diff)
downloadvolse-hubzilla-d20a0cb6abe92e05f4387a6b3ad504b422275fb1.tar.gz
volse-hubzilla-d20a0cb6abe92e05f4387a6b3ad504b422275fb1.tar.bz2
volse-hubzilla-d20a0cb6abe92e05f4387a6b3ad504b422275fb1.zip
fix intltext template driver
Diffstat (limited to 'include/dba')
-rwxr-xr-xinclude/dba/dba_driver.php1
-rwxr-xr-xinclude/dba/dba_mysqli.php7
2 files changed, 7 insertions, 1 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index abc759adc..c829c3714 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -53,6 +53,7 @@ abstract class dba_driver {
return false;
}
}
+ return true;
}
diff --git a/include/dba/dba_mysqli.php b/include/dba/dba_mysqli.php
index 9cb60cb8c..f1a50cc3f 100755
--- a/include/dba/dba_mysqli.php
+++ b/include/dba/dba_mysqli.php
@@ -5,13 +5,18 @@ require_once('include/dba/dba_driver.php');
class dba_mysqli extends dba_driver {
function connect($server, $port, $user,$pass,$db) {
- $this->db = new mysqli($server,$user,$pass,$db, $port);
+ 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->connected) {
return true;
}
+ $this->error = $this->db->connect_error;
return false;
}