Rename DBA::get_db to DBA::getConnection

[friendica.git] / src / Database / DBM.php

diff --git a/src/Database/DBM.php b/src/Database/DBM.php
index 6f14c12b8c51af9d878597f51a0e3d4228926851..62e5bee2e2c151d208a5780d503d7d237727954c 100644 (file)
--- a/src/Database/DBM.php
+++ b/src/Database/DBM.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Database;
 
-use dba;
 use Friendica\Util\DateTimeFormat;
 
 require_once 'include/dba.php';
@@ -65,7 +64,7 @@ class DBM
                }
 
                if (is_object($array)) {
-                       return dba::num_rows($array) > 0;
+                       return DBA::numRows($array) > 0;
                }
 
                return (is_array($array) && (count($array) > 0));
@@ -114,19 +113,13 @@ class DBM
        /**
         * Checks Converts any date string into a SQL compatible date string
         *
+        * @deprecated since version 3.6
         * @param string $date a date string in any format
         *
         * @return string SQL style date string
         */
        public static function date($date = 'now')
        {
-               $timestamp = strtotime($date);
-
-               // Don't allow lower date strings as '0001-01-01 00:00:00'
-               if ($timestamp < -62135596800) {
-                       $timestamp = -62135596800;
-               }
-
-               return date(DateTimeFormat::MYSQL, (int)$timestamp);
+               return DateTimeFormat::utc($date);
        }
 }