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

Move Temporal::convert() to DateTimeFormat::convert()

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-26 21:38:34 -05:00
commit 5e7285b9ba
64 changed files with 568 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mod/profiles.php
View file

@ -18,7 +18,7 @@ use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Model\Item;
use Friendica\Network\Probe;
use Friendica\Util\Temporal;
use Friendica\Util\DateTimeFormat;
function profiles_init(App $a) {
@ -220,9 +220,9 @@ function profiles_post(App $a) {
}
if ($ignore_year) {
$dob = '0000-' . Temporal::utc('1900-' . $dob, 'm-d');
$dob = '0000-' . DateTimeFormat::utc('1900-' . $dob, 'm-d');
} else {
$dob = Temporal::utc($dob, 'Y-m-d');
$dob = DateTimeFormat::utc($dob, 'Y-m-d');
}
}
@ -253,7 +253,7 @@ function profiles_post(App $a) {
if (! strlen($howlong)) {
$howlong = NULL_DATE;
} else {
$howlong = Temporal::convert($howlong, 'UTC', date_default_timezone_get());
$howlong = DateTimeFormat::convert($howlong, 'UTC', date_default_timezone_get());
}
// linkify the relationship target if applicable
@ -488,7 +488,7 @@ function profiles_post(App $a) {
if ($namechanged && $is_default) {
$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
dbesc($name),
dbesc(Temporal::utcNow()),
dbesc(DateTimeFormat::utcNow()),
intval(local_user())
);
$r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
@ -725,7 +725,7 @@ function profiles_content(App $a) {
'$gender' => ContactSelector::gender($r[0]['gender']),
'$marital' => ContactSelector::maritalStatus($r[0]['marital']),
'$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
'$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : Temporal::local($r[0]['howlong']))],
'$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
'$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
'$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
'$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],