Changed according feedback:

- $posted_date should not allow NULL, instead use `?? ''` instead - this happened in e.g. 2FA app-specific password listing
friendica · Oct 14, 2022 · 19cf4d8 · 19cf4d8
1 parent bcbf5bc
commit 19cf4d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Security/TwoFactor/Model/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php
@@ -86,7 +86,7 @@ public static function getListForUser($uid)
 		$appSpecificPasswords = DBA::toArray($appSpecificPasswordsStmt);
 
 		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['local'] = $value['last_used'] ? DateTimeFormat::local($value['last_used'], 'r') : '';
 		});

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