From: Roland Häder <roland@mxchange.org>
Date: Mon, 12 Sep 2022 21:12:11 +0000 (+0200)
Subject: Rewrite:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ceb04c0726db3ed51db2d34b9df18245724c7be8;p=friendica.git

Rewrite:
- moved constants GRAVITY_* from boot.php to Friendica\Model\Item
- also rewrote some array initialization:

From:
````
<?php
$arr = [];
$arr['foo'] = "FOO";
````

To:
````
<?php
$arr['foo'] = "FOO";
````
- added a few type-hints
---

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 7e0d56e092..07cfe7242c 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -725,7 +725,6 @@ class Database
 				$duration  = round($duration, 3);
 				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-<<<<<<< HEAD
 				@file_put_contents(
 					$this->config->get('system', 'db_log'),
 					DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
@@ -734,12 +733,6 @@ class Database
 					substr($this->replaceParameters($sql, $args), 0, 4000) . "\n",
 					FILE_APPEND
 				);
-=======
-				@file_put_contents($this->configCache->get('system', 'db_log'), DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
-				                                                                basename($backtrace[1]['file']) . "\t" .
-				                                                                $backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" .
-				                                                                substr($this->replaceParameters($sql, $args), 0, 4000) . "\n", FILE_APPEND);
->>>>>>> 82391ca61 (Changes:)
 			}
 		}
 		return $retval;