Merge pull request #7598 from annando/fix-picture-detection

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 32d3b1dde01eef07fcb9925525f8dc9e09b83db4..c56f63a84b444ecb425d0232931b8f65435d7f63 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -2,29 +2,23 @@
 
 use Friendica\Database\DBA;
 
-function dbesc($str) {
-       if (DBA::$connected) {
-               return(DBA::escape($str));
-       } else {
-               return(str_replace("'","\\'",$str));
-       }
-}
-
 /**
  * @brief execute SQL query with printf style args - deprecated
  *
- * Please use the dba:: functions instead:
- * dba::select, dba::exists, dba::insert
- * dba::delete, dba::update, dba::p, dba::e
+ * Please use the DBA:: functions instead:
+ * DBA::select, DBA::exists, DBA::insert
+ * DBA::delete, DBA::update, DBA::p, DBA::e
  *
- * @param $args Query parameters (1 to N parameters of different types)
+ * @param $sql
  * @return array|bool Query array
+ * @throws Exception
+ * @deprecated
  */
 function q($sql) {
        $args = func_get_args();
        unset($args[0]);
 
-       if (!DBA::$connected) {
+       if (!DBA::connected()) {
                return false;
        }
 
@@ -41,7 +35,7 @@ function q($sql) {
 
        $columns = DBA::columnCount($ret);
 
-       $data = DBA::inArray($ret);
+       $data = DBA::toArray($ret);
 
        if ((count($data) == 0) && ($columns == 0)) {
                return true;
@@ -49,7 +43,3 @@ function q($sql) {
 
        return $data;
 }
-
-function dba_timer() {
-       return microtime(true);
-}