Fix (short) profile editing showing 'e' for martial and sexual preference

diff --git a/mod/profiles.php b/mod/profiles.php
index 76491c553edf8cb3c7e3f0b481488aaad4907b2a..7d0c3178cf0600831055aed9b20d906d7f4a6208 100644 (file)
--- 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 cd4ed1816f6adbd8dcd9d8791a1c8914fa524f98..89353e1a6c23923a13596eddc15b88000319c8a9 100644 (file)
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -169,7 +169,7 @@
                                        <div class="section-content-tools-wrapper">
                                                <div id="profile-edit-marital-wrapper" class="form-group field select" >
                                                                <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}}</label>
-                                                               {{$marital}}
+                                                               {{$marital.selector}}
                                                </div>
                                                <div class="clear"></div>
 
@@ -179,7 +179,7 @@
 
                                                <div id="profile-edit-sexual-wrapper" class="form-group field select" >
                                                        <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
-                                                       {{$sexual}}
+                                                       {{$sexual.selector}}
                                                </div>
                                                <div class="clear"></div>
 
@@ -318,10 +318,10 @@
                <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
                <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
                <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
-               <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
+               <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.value}}" />
                <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
                <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
-               <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
+               <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.value}}" />
                <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
                <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
                <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />