Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 19:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use DateTimeFormat::utc() instead of DBM::date()

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-21 08:25:11 -04:00 • committed by Hypolite Petovan
parent c55e389bbc
commit 8ddb94ef06
7 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Model/Conversation.php
View file

@ -6,6 +6,7 @@ namespace Friendica\Model;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat;
require_once "include/dba.php";
@ -27,7 +28,7 @@ class Conversation
*/
public static function insert($arr) {
if (in_array(defaults($arr, 'network', NETWORK_PHANTOM), [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && !empty($arr['uri'])) {
$conversation = ['item-uri' => $arr['uri'], 'received' => DBM::date()];
$conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
$conversation['reply-to-uri'] = $arr['parent-uri'];

4
src/Model/GContact.php
View file

@ -815,7 +815,7 @@ class GContact
self::fixAlternateContactAddress($contact);
if (!isset($contact["updated"])) {
$contact["updated"] = DBM::date();
$contact["updated"] = DateTimeFormat::utcNow();
}
if ($contact["network"] == NETWORK_TWITTER) {
@ -858,7 +858,7 @@ class GContact
logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
$condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
normalise_link($contact["url"]), $contact["generation"]];
$contact["updated"] = DBM::date($contact["updated"]);
$contact["updated"] = DateTimeFormat::utc($contact["updated"]);
$updated = ['photo' => $contact['photo'], 'name' => $contact['name'],
'nick' => $contact['nick'], 'addr' => $contact['addr'],