From 17019772a4a3ce7b55fbe7930e9902d86ae39b6f Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Sat, 6 Oct 2018 11:37:15 +0200 Subject: [PATCH] Fix (short) profile editing showing 'e' for martial and sexual preference --- mod/profiles.php | 4 ++-- view/theme/frio/templates/profile_edit.tpl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index 76491c553..7d0c3178c 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -615,10 +615,10 @@ function profiles_content(App $a) { '$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']], '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), '$gender' => ContactSelector::gender($r[0]['gender']), - '$marital' => ContactSelector::maritalStatus($r[0]['marital']), + '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => $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 ? '' : DateTimeFormat::local($r[0]['howlong']))], - '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']), + '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => $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.")], '$homepage' => ['homepage', L10n::t('Homepage URL:'), $r[0]['homepage']], diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl index cd4ed1816..89353e1a6 100644 --- a/view/theme/frio/templates/profile_edit.tpl +++ b/view/theme/frio/templates/profile_edit.tpl @@ -169,7 +169,7 @@
- {{$marital}} + {{$marital.selector}}
@@ -179,7 +179,7 @@
- {{$sexual}} + {{$sexual.selector}}
@@ -318,10 +318,10 @@ - + - +