From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 21 Sep 2019 09:15:52 +0000 (-0400)
Subject: Remove dependency to App object in Temporal::getDateofBirthField
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=118e737a49b87d508252b8fc4104c18d503e4e68;p=friendica.git

Remove dependency to App object in Temporal::getDateofBirthField
---

diff --git a/mod/profiles.php b/mod/profiles.php
index 58f23e4634..72bcac49fc 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -594,7 +594,7 @@ function profiles_content(App $a) {
 			'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . L10n::t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
 			'$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']],
 			'$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']],
-			'$dob' => Temporal::getDateofBirthField($r[0]['dob']),
+			'$dob' => Temporal::getDateofBirthField($r[0]['dob'], $a->user['timezone']),
 			'$hide_friends' => $hide_friends,
 			'$address' => ['address', L10n::t('Street Address:'), $r[0]['address']],
 			'$locality' => ['locality', L10n::t('Locality/City:'), $r[0]['locality']],
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index ec71ab5e96..d08db24504 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -122,13 +122,12 @@ class Temporal
 	 * @brief Wrapper for date selector, tailored for use in birthday fields.
 	 *
 	 * @param string $dob Date of Birth
+	 * @param string $timezone
 	 * @return string Formatted HTML
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
-	public static function getDateofBirthField($dob)
+	public static function getDateofBirthField($dob, $timezone = 'UTC')
 	{
-		$a = \get_app();
-
 		list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
 
 		if ($dob < '0000-01-01') {
@@ -137,7 +136,7 @@ class Temporal
 			$value = DateTimeFormat::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d');
 		}
 
-		$age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : "");
+		$age = (intval($value) ? self::getAgeByTimezone($value, $timezone, $timezone) : "");
 
 		$tpl = Renderer::getMarkupTemplate("field_input.tpl");
 		$o = Renderer::replaceMacros($tpl,