Merge remote-tracking branch 'friendica/develop' into develop

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 3bf68f764e5597abdfd72fac05c91d1e371fd178..0790e503ea3d24cef132442f8e949dac98e5333d 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -7,12 +7,12 @@ function contact_profile_assign($current,$foreign_net) {
 
        $disabled = (($foreign_net) ? ' disabled="true" ' : '');
 
-       $o .= "<select id=\"contact-profile-selector\" $disabled name=\"profile-assign\" />\r\n";
+       $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",
-                        intval($_SESSION['uid']));
+                       intval($_SESSION['uid']));
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";