Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-22 22:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed:

Browse source 
- re-added `null` again https://github.com/friendica/friendica/pull/11900#discussion_r979248182
- removed null coalescing operator
This commit is contained in:
Roland Häder 2022-10-18 18:20:08 +02:00
parent 2773ac9909
commit c36da392f8
No known key found for this signature in database
GPG key ID: C82EDE5DDFA0BA77
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Security/TwoFactor/Model/AppSpecificPassword.php
View file

@ -86,7 +86,7 @@ class AppSpecificPassword
$appSpecificPasswords = DBA::toArray($appSpecificPasswordsStmt); $appSpecificPasswords = DBA::toArray($appSpecificPasswordsStmt);
array_walk($appSpecificPasswords, function (&$value) { array_walk($appSpecificPasswords, function (&$value) {
$value['ago'] = Temporal::getRelativeDate($value['last_used'] ?? ''); $value['ago'] = Temporal::getRelativeDate($value['last_used']);
$value['utc'] = $value['last_used'] ? DateTimeFormat::utc($value['last_used'], 'c') : ''; $value['utc'] = $value['last_used'] ? DateTimeFormat::utc($value['last_used'], 'c') : '';
$value['local'] = $value['last_used'] ? DateTimeFormat::local($value['last_used'], 'r') : ''; $value['local'] = $value['last_used'] ? DateTimeFormat::local($value['last_used'], 'r') : '';
}); });

9
src/Util/Temporal.php
View file

@ -311,13 +311,16 @@ class Temporal
* *
* @return string with relative date * @return string with relative date
*/ */
public static function getRelativeDate(string $posted_date, string $format = null): string public static function getRelativeDate(string $posted_date = null, string $format = null): string
{ {
$localtime = $posted_date . ' UTC'; if (empty($posted_date) || $posted_date <= DBA::NULL_DATETIME) {
return DI::l10n()->t('never');
}
$localtime = $posted_date . ' UTC';
$abs = strtotime($localtime); $abs = strtotime($localtime);
if (empty($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) { if ($abs === false) {
return DI::l10n()->t('never'); return DI::l10n()->t('never');
} }