Merge pull request #8211 from nupplaphil/task/mod_crepair

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index bccd9792bea798f020c99a7486c4e7dd769fa2aa..a90ec26fbb0001c31abe9cc4012adc4bda1cee74 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
+ * 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;
        }
 
@@ -49,7 +43,3 @@ function q($sql) {
 
        return $data;
 }
-
-function dba_timer() {
-       return microtime(true);
-}