]> git.mxchange.org Git - friendica.git/commitdiff
Remove dependency to App object in Temporal::getDateofBirthField
authorHypolite Petovan <hypolite@mrpetovan.com>
Sat, 21 Sep 2019 09:15:52 +0000 (05:15 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sat, 21 Sep 2019 09:15:52 +0000 (05:15 -0400)
mod/profiles.php
src/Util/Temporal.php

index 58f23e4634afff5d1a87a5af876a0cd5ccb98040..72bcac49fc0b6ebf7760111a069f67d8dca16428 100644 (file)
@@ -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']],
index ec71ab5e963e4604f7c8c072ff1c11295f7bc3b7..d08db24504ec50b9df470d83c71819bf86f18294 100644 (file)
@@ -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,