This commit is contained in:
Philipp Holzer 2019-04-14 18:46:49 +02:00
parent d7138c967c
commit 799417ed1a
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
2 changed files with 18 additions and 6 deletions

View File

@ -18,24 +18,26 @@ function q($sql) {
$args = func_get_args();
unset($args[0]);
if (!DBA::$connected) {
$dba = DBA::getDb();
if (!$dba->connected) {
return false;
}
$sql = DBA::cleanQuery($sql);
$sql = DBA::anyValueFallback($sql);
$sql = $dba->cleanQuery($sql);
$sql = $dba->anyValueFallback($sql);
$stmt = @vsprintf($sql, $args);
$ret = DBA::p($stmt);
$ret = $dba->p($stmt);
if (is_bool($ret)) {
return $ret;
}
$columns = DBA::columnCount($ret);
$columns = $dba->columnCount($ret);
$data = DBA::toArray($ret);
$data = $dba->toArray($ret);
if ((count($data) == 0) && ($columns == 0)) {
return true;

View File

@ -32,6 +32,16 @@ class DBA
self::$dba = $dba;
}
/**
* Returns the current Database instance
*
* @return Database
*/
public static function getDb()
{
return self::$dba;
}
/**
* @brief Returns the MySQL server version string
*