clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases 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
src/Database/DBStructure.php
+3 -2
View File
@@ -8,6 +8,7 @@ use Exception;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Util\DateTimeFormat;
require_once 'boot.php';
require_once 'include/dba.php';
@@ -207,7 +208,7 @@ class DBStructure
public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null) {
if ($action && !$install) {
Config::set('system', 'maintenance', 1);
Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DBM::date().' '.date('e')));
Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow().' '.date('e')));
}
$errors = '';
@@ -469,7 +470,7 @@ class DBStructure
if ($action) {
if (!$install) {
Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DBM::date().' '.date('e'), $name));
Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DateTimeFormat::utcNow().' '.date('e'), $name));
}
// Ensure index conversion to unique removes duplicates
src/Model/Conversation.php
+2 -1
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'];
src/Model/GContact.php
+2 -2
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'],
src/Network/Probe.php
+1 -1
View File
@@ -411,7 +411,7 @@ class Probe
}
}
$fields['updated'] = DBM::date();
$fields['updated'] = DateTimeFormat::utcNow();
$condition = ['nurl' => normalise_link($data["url"])];
src/Protocol/DFRN.php
+1 -1
View File
@@ -1748,7 +1748,7 @@ class DFRN
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]),
dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]),
dbesc(DBM::date($contact["name-date"])), dbesc(DBM::date($contact["uri-date"])),
dbesc(DateTimeFormat::utc($contact["name-date"])), dbesc(DateTimeFormat::utc($contact["uri-date"])),
intval($contact["id"]), dbesc($contact["network"])
);
}