X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=05059e3358abcfc92170569b8905979ddf4bb606;hb=217a8ce6ee8fd163d81c71044d9497646296862f;hp=e3e13ef22764938b19de4e8171448bc30227784c;hpb=9423db628fd11c7c7290802d1311398c630c702e;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index e3e13ef227..05059e3358 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";
 		}
 	}
@@ -100,13 +100,13 @@ function network_to_name($s, $profile = "") {
 
 	$networkname = str_replace($search, $replace, $s);
 
-	if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) AND ($profile != "")) {
-		$r = q("SELECT `gserver`.`platform` FROM `gcontact`
+	if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) && ($profile != "")) {
+		$r = dba::fetch_first("SELECT `gserver`.`platform` FROM `gcontact`
 				INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
-				WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''",
-				dbesc(normalise_link($profile)));
+				WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
+
 		if (dbm::is_result($r)) {
-			$networkname = $r[0]["platform"];
+			$networkname = $r['platform'];
 		}
 	}