clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect Temporal reference after Item function move rebase

This commit is contained in:
Hypolite Petovan 2018-01-28 13:28:22 -05:00
parent bb5670016e
commit 0454d0a670
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Model/Item.php
View File

@ -302,11 +302,11 @@ class Item extends BaseObject
$arr['owner-name'] = trim(defaults($arr, 'owner-name', '')); $arr['owner-name'] = trim(defaults($arr, 'owner-name', ''));
$arr['owner-link'] = trim(defaults($arr, 'owner-link', '')); $arr['owner-link'] = trim(defaults($arr, 'owner-link', ''));
$arr['owner-avatar'] = trim(defaults($arr, 'owner-avatar', '')); $arr['owner-avatar'] = trim(defaults($arr, 'owner-avatar', ''));
$arr['received'] = ((x($arr, 'received') !== false) ? Temporal::convert($arr['received']) : Temporal::convert()); $arr['received'] = ((x($arr, 'received') !== false) ? DateTimeFormat::utc($arr['received']) : DateTimeFormat::utcNow());
$arr['created'] = ((x($arr, 'created') !== false) ? Temporal::convert($arr['created']) : $arr['received']); $arr['created'] = ((x($arr, 'created') !== false) ? DateTimeFormat::utc($arr['created']) : $arr['received']);
$arr['edited'] = ((x($arr, 'edited') !== false) ? Temporal::convert($arr['edited']) : $arr['created']); $arr['edited'] = ((x($arr, 'edited') !== false) ? DateTimeFormat::utc($arr['edited']) : $arr['created']);
$arr['changed'] = ((x($arr, 'changed') !== false) ? Temporal::convert($arr['changed']) : $arr['created']); $arr['changed'] = ((x($arr, 'changed') !== false) ? DateTimeFormat::utc($arr['changed']) : $arr['created']);
$arr['commented'] = ((x($arr, 'commented') !== false) ? Temporal::convert($arr['commented']) : $arr['created']); $arr['commented'] = ((x($arr, 'commented') !== false) ? DateTimeFormat::utc($arr['commented']) : $arr['created']);
$arr['title'] = trim(defaults($arr, 'title', '')); $arr['title'] = trim(defaults($arr, 'title', ''));
$arr['location'] = trim(defaults($arr, 'location', '')); $arr['location'] = trim(defaults($arr, 'location', ''));
$arr['coord'] = trim(defaults($arr, 'coord', '')); $arr['coord'] = trim(defaults($arr, 'coord', ''));
@ -342,13 +342,13 @@ class Item extends BaseObject
} }
// Items cannot be stored before they happen ... // Items cannot be stored before they happen ...
if ($arr['created'] > Temporal::convert()) { if ($arr['created'] > DateTimeFormat::utcNow()) {
$arr['created'] = Temporal::convert(); $arr['created'] = DateTimeFormat::utcNow();
} }
// We haven't invented time travel by now. // We haven't invented time travel by now.
if ($arr['edited'] > Temporal::convert()) { if ($arr['edited'] > DateTimeFormat::utcNow()) {
$arr['edited'] = Temporal::convert(); $arr['edited'] = DateTimeFormat::utcNow();
} }
if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) { if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) {
@ -742,9 +742,9 @@ class Item extends BaseObject
// update the commented timestamp on the parent // update the commented timestamp on the parent
// Only update "commented" if it is really a comment // Only update "commented" if it is really a comment
if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) { if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) {
dba::update('item', ['commented' => Temporal::convert(), 'changed' => Temporal::convert()], ['id' => $parent_id]); dba::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} else { } else {
dba::update('item', ['changed' => Temporal::convert()], ['id' => $parent_id]); dba::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} }
if ($dsprsig) { if ($dsprsig) {
@ -1644,7 +1644,7 @@ class Item extends BaseObject
intval($wall ? 1 : 0) intval($wall ? 1 : 0)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return substr(Temporal::convert($r[0]['created'], date_default_timezone_get()),0,10); return substr(DateTimeFormat::local($r[0]['created']),0,10);
} }
return false; return false;
} }