diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 64a2b5be9..2fd9f61fe 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -234,59 +234,4 @@ class ContactSelector $o .= ''; return $o; } - - /** - * @param string $current optional, default empty - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public static function maritalStatus($current = "") - { - $o = ''; - $select = [ - '' => DI::l10n()->t('No answer'), - 'Single' => DI::l10n()->t('Single'), - 'Lonely' => DI::l10n()->t('Lonely'), - 'In a relation' => DI::l10n()->t('In a relation'), - 'Has crush' => DI::l10n()->t('Has crush'), - 'Infatuated' => DI::l10n()->t('Infatuated'), - 'Dating' => DI::l10n()->t('Dating'), - 'Unfaithful' => DI::l10n()->t('Unfaithful'), - 'Sex Addict' => DI::l10n()->t('Sex Addict'), - 'Friends' => DI::l10n()->t('Friends'), - 'Friends/Benefits' => DI::l10n()->t('Friends/Benefits'), - 'Casual' => DI::l10n()->t('Casual'), - 'Engaged' => DI::l10n()->t('Engaged'), - 'Married' => DI::l10n()->t('Married'), - 'Imaginarily married' => DI::l10n()->t('Imaginarily married'), - 'Partners' => DI::l10n()->t('Partners'), - 'Cohabiting' => DI::l10n()->t('Cohabiting'), - 'Common law' => DI::l10n()->t('Common law'), - 'Happy' => DI::l10n()->t('Happy'), - 'Not looking' => DI::l10n()->t('Not looking'), - 'Swinger' => DI::l10n()->t('Swinger'), - 'Betrayed' => DI::l10n()->t('Betrayed'), - 'Separated' => DI::l10n()->t('Separated'), - 'Unstable' => DI::l10n()->t('Unstable'), - 'Divorced' => DI::l10n()->t('Divorced'), - 'Imaginarily divorced' => DI::l10n()->t('Imaginarily divorced'), - 'Widowed' => DI::l10n()->t('Widowed'), - 'Uncertain' => DI::l10n()->t('Uncertain'), - 'It\'s complicated' => DI::l10n()->t('It\'s complicated'), - 'Don\'t care' => DI::l10n()->t('Don\'t care'), - 'Ask me' => DI::l10n()->t('Ask me'), - ]; - - Hook::callAll('marital_selector', $select); - - $o .= ''; - return $o; - } } diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 0da9fbf35..ff1575695 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -370,7 +370,6 @@ class Profile } $gender = !empty($profile['gender']) ? DI::l10n()->t('Gender:') : false; - $marital = !empty($profile['marital']) ? DI::l10n()->t('Status:') : false; $homepage = !empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false; $about = !empty($profile['about']) ? DI::l10n()->t('About:') : false; $xmpp = !empty($profile['xmpp']) ? DI::l10n()->t('XMPP:') : false; @@ -449,10 +448,6 @@ class Profile $p['gender'] = DI::l10n()->t($p['gender']); } - if (isset($p['marital'])) { - $p['marital'] = DI::l10n()->t($p['marital']); - } - if (isset($p['photo'])) { $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL); } @@ -474,7 +469,6 @@ class Profile '$account_type' => $account_type, '$location' => $location, '$gender' => $gender, - '$marital' => $marital, '$homepage' => $homepage, '$about' => $about, '$network' => DI::l10n()->t('Network:'), @@ -919,7 +913,6 @@ class Profile (`profile`.`locality` LIKE ?) OR (`profile`.`region` LIKE ?) OR (`profile`.`country-name` LIKE ?) OR - (`profile`.`marital` LIKE ?) OR (`profile`.`sexual` LIKE ?) OR (`profile`.`about` LIKE ?) OR (`profile`.`romance` LIKE ?) OR @@ -960,7 +953,6 @@ class Profile (`profile`.`locality` LIKE ?) OR (`profile`.`region` LIKE ?) OR (`profile`.`country-name` LIKE ?) OR - (`profile`.`marital` LIKE ?) OR (`profile`.`sexual` LIKE ?) OR (`profile`.`about` LIKE ?) OR (`profile`.`romance` LIKE ?) OR diff --git a/src/Module/Directory.php b/src/Module/Directory.php index 54fbb01ac..7a6b65cf7 100644 --- a/src/Module/Directory.php +++ b/src/Module/Directory.php @@ -137,7 +137,6 @@ class Directory extends BaseModule $location = ''; } - $marital = (!empty($profile['marital']) ? DI::l10n()->t('Status:') : false); $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false); $about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false); @@ -160,7 +159,6 @@ class Directory extends BaseModule 'location' => $location_e, 'tags' => $contact['pub_keywords'], 'pdesc' => $pdesc, - 'marital' => $marital, 'homepage' => $homepage, 'about' => $about, 'photo_menu' => $photo_menu, diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php index 1df049525..07ecf23d8 100644 --- a/src/Module/NoScrape.php +++ b/src/Module/NoScrape.php @@ -103,7 +103,7 @@ class NoScrape extends BaseModule $json_info['last-activity'] = date('o-W', $last_active); //These are optional fields. - $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'marital', 'about']; + $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'about']; foreach ($profile_fields as $field) { if (!empty($a->profile[$field])) { $json_info["$field"] = $a->profile[$field]; diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index 1ee330266..826074a31 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -43,8 +43,6 @@ {{if $updated}}{{/if}} - {{if $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl index 3c933c833..4a835961b 100644 --- a/view/theme/duepuntozero/templates/profile/vcard.tpl +++ b/view/theme/duepuntozero/templates/profile/vcard.tpl @@ -30,8 +30,6 @@ {{if $profile.pubkey}}{{/if}} - {{if $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} {{include file="diaspora_vcard.tpl"}} diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index 1673a9c99..5ac982fa2 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -115,13 +115,6 @@ {{if $updated}}{{/if}} - {{if $marital}} -
- - {{$profile.marital}} -
- {{/if}} - {{if $homepage}}
diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl index fd455fba5..5e7b3efc8 100644 --- a/view/theme/quattro/templates/profile/vcard.tpl +++ b/view/theme/quattro/templates/profile/vcard.tpl @@ -49,8 +49,6 @@ {{if $profile.pubkey}}{{/if}} - {{if $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl index 6331e84c4..7511988cb 100644 --- a/view/theme/vier/templates/profile/vcard.tpl +++ b/view/theme/vier/templates/profile/vcard.tpl @@ -54,8 +54,6 @@ {{if $updated}}{{/if}} - {{if $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}}