Merge branch 'develop' into rewrites/coding-convention-split2-1-2

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index e3e13ef22764938b19de4e8171448bc30227784c..7069af066409164984c824313174e8ae2f16f292 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) {
 
        $o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" />\r\n";
 
-       $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
+       $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d",
                        intval($_SESSION['uid']));
 
        if (dbm::is_result($r)) {
                foreach ($r as $rr) {
-                       $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
+                       $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
                }
        }