Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / profile_selectors.php

diff --git a/include/profile_selectors.php b/include/profile_selectors.php
index a2cef959dbffa0720c17017bffca2e0994a334e0..4700bb96f2ae6190dabf8ebe0a6e4bdf6e98845c 100644 (file)
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
@@ -7,8 +7,10 @@ function gender_selector($current="",$suffix="") {
 
        $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
        foreach($select as $selection) {
-               $selected = (($selection == $current) ? ' selected="selected" ' : '');
-               $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               if($selection !== 'NOTRANSLATION') {
+                       $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                       $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               }
        }
        $o .= '</select>';
        return $o;
@@ -20,8 +22,10 @@ function sexpref_selector($current="",$suffix="") {
 
        $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
        foreach($select as $selection) {
-               $selected = (($selection == $current) ? ' selected="selected" ' : '');
-               $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               if($selection !== 'NOTRANSLATION') {
+                       $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                       $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               }
        }
        $o .= '</select>';
        return $o;
@@ -34,8 +38,10 @@ function marital_selector($current="",$suffix="") {
 
        $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
        foreach($select as $selection) {
-               $selected = (($selection == $current) ? ' selected="selected" ' : '');
-               $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               if($selection !== 'NOTRANSLATION') {
+                       $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                       $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               }
        }
        $o .= '</select>';
        return $o;