Remove uses of profile.marital

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 64a2b5be9e4f4b92182a1f277a5408c88f27e6b2..2fd9f61fe4bea08bc9c3b61f8681b59f4e62b910 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -234,59 +234,4 @@ class ContactSelector
                $o .= '</select>';
                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 .= '<select name="marital" id="marital-select" size="1" >';
-               foreach ($select as $neutral => $selection) {
-                       if ($selection !== 'NOTRANSLATION') {
-                               $selected = (($neutral == $current) ? ' selected="selected" ' : '');
-                               $o .= "<option value=\"$neutral\" $selected >$selection</option>";
-                       }
-               }
-               $o .= '</select>';
-               return $o;
-       }
 }

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 0da9fbf35972c15675e89ecdddbb07d12b5a1ba1..ff1575695d5e92869b69c61bd0086c90693f4779 100644 (file)
--- 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 54fbb01ac86bd7343ad3434995998c63186c000e..7a6b65cf78f24881f65b497a6eda3b4b698036d4 100644 (file)
--- 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 1df049525d8e0a26adcb72e1768f8013d2065f10..07ecf23d8ac26d9ec87cc6e67563001be3beca0f 100644 (file)
--- 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 1ee33026690971072427c645fc9c9b1742e7975c..826074a313fe5e3f0273a09531227704e0f35527 100644 (file)
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -43,8 +43,6 @@
 
        {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
        {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}

diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
index 3c933c8333552bf5a13dfcaa3a84eae3df98334b..4a835961b6f738fbfca7bebc5ad39ed05e360ec0 100644 (file)
--- a/view/theme/duepuntozero/templates/profile/vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -30,8 +30,6 @@
        
        {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/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 1673a9c9990d61d5b354246afb05c721ec7dd39c..5ac982fa253a30aa8c43848a65b526b5cefead99 100644 (file)
--- a/view/theme/frio/templates/profile/vcard.tpl
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -115,13 +115,6 @@
 
                {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
-               {{if $marital}}
-               <div class="marital detail">
-                       <span class="marital-label icon"><i class="fa fa-heart"></i></span>
-                       <span class="marital-text icon">{{$profile.marital}}</span>
-               </div>
-               {{/if}}
-
                {{if $homepage}}
                <div class="homepage detail">
                        <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>

diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index fd455fba5861bddbddf7516ea35c72f94dc56634..5e7b3efc8628b6454c569ffacd20b5f04871d0a0 100644 (file)
--- a/view/theme/quattro/templates/profile/vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -49,8 +49,6 @@
        
        {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
        {{if $homepage}}
        <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
                <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>

diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
index 6331e84c4e6f0e90d5d4b2bee1c092ca46d065ba..7511988cba661fc6a7f892bb2fb37a6ed30c8fc4 100644 (file)
--- a/view/theme/vier/templates/profile/vcard.tpl
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -54,8 +54,6 @@
 
        {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
        {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}