bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Replace forgotten datetime_convert() instances

Browse source
This commit is contained in:
Hypolite Petovan 2018-02-03 20:44:19 -05:00
parent 6b50c42de6
commit 4050a7b8dc
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact.php
View file

@ -1388,7 +1388,7 @@ class Contact extends BaseObject
`blocked`, `readonly`, `pending`, `writable`) `blocked`, `readonly`, `pending`, `writable`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)", VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
intval($importer['uid']), intval($importer['uid']),
dbesc(datetime_convert()), dbesc(DateTimeFormat::utcNow()),
dbesc($url), dbesc($url),
dbesc(normalise_link($url)), dbesc(normalise_link($url)),
dbesc($name), dbesc($name),
@ -1418,7 +1418,7 @@ class Contact extends BaseObject
if (is_array($contact_record)) { if (is_array($contact_record)) {
dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'], dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
'blocked' => false, 'knowyou' => false, 'blocked' => false, 'knowyou' => false,
'hash' => $hash, 'datetime' => datetime_convert()]); 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
} }
Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);

2
src/Util/DateTimeFormat.php
View file

@ -122,7 +122,7 @@ class DateTimeFormat
try { try {
$d = new DateTime($s, $from_obj); $d = new DateTime($s, $from_obj);
} catch (Exception $e) { } catch (Exception $e) {
logger('datetime_convert: exception: ' . $e->getMessage()); logger('DateTimeFormat::convert: exception: ' . $e->getMessage());
$d = new DateTime('now', $from_obj); $d = new DateTime('now', $from_obj);
} }