Move Temporal::convert() to DateTimeFormat::convert()

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index b1b689fdf77def7090d8b5bd54059e1fc9c1cd24..f6bab9e3c58e0eb85a6ebae86495da91652dd9cd 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,7 +1,10 @@
 <?php
+
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
+use Friendica\Util\DateTimeFormat;
 
 require_once('include/datetime.php');
 
@@ -55,7 +58,7 @@ class dba {
                if ($install) {
                        if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
                                if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-                                       self::$error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
+                                       self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
                                        self::$connected = false;
                                        self::$db = null;
                                        return false;
@@ -187,7 +190,7 @@ class dba {
 
                        if ($log) {
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                               @file_put_contents($a->config["system"]["db_log_index"], datetime_convert()."\t".
+                               @file_put_contents($a->config["system"]["db_log_index"], DateTimeFormat::utcNow()."\t".
                                                $row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
                                                basename($backtrace[1]["file"])."\t".
                                                $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
@@ -492,7 +495,7 @@ class dba {
                                $duration = round($duration, 3);
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-                               @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t".
+                               @file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t".
                                                basename($backtrace[1]["file"])."\t".
                                                $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
                                                substr(self::replace_parameters($sql, $args), 0, 2000)."\n", FILE_APPEND);
@@ -1145,6 +1148,7 @@ class dba {
 
                $condition_string = self::buildCondition($condition);
 
+               $order_string = '';
                if (isset($params['order'])) {
                        $order_string = " ORDER BY ";
                        foreach ($params['order'] AS $fields => $order) {
@@ -1157,6 +1161,7 @@ class dba {
                        $order_string = substr($order_string, 0, -2);
                }
 
+               $limit_string = '';
                if (isset($params['limit']) && is_int($params['limit'])) {
                        $limit_string = " LIMIT " . $params['limit'];
                }