From a8c20013c4c33860ab199faa7e7cfe152d26f45c Mon Sep 17 00:00:00 2001
From: Jens Tautenhahn <shogun@tausys.de>
Date: Wed, 19 Apr 2017 20:25:25 +0100
Subject: [PATCH] displays the correct profile for contacts that have set the
 default profile

---
 include/contact_selectors.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 56c032847c..f5dfdc12d7 100644
--- 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";
 		}
 	}