Merge pull request #3918 from annando/additional-features

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 05059e3358abcfc92170569b8905979ddf4bb606..1e754ac9f7a2655c53ca62897411de481c33c606 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -1,5 +1,7 @@
 <?php
-require_once('include/diaspora.php');
+
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function contact_profile_assign($current,$foreign_net) {
 
@@ -7,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) {
 
        $disabled = (($foreign_net) ? ' disabled="true" ' : '');
 
-       $o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $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`, `is-default` FROM `profile` WHERE `uid` = %d",
                        intval($_SESSION['uid']));
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach ($r as $rr) {
                        $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
@@ -105,7 +107,7 @@ function network_to_name($s, $profile = "") {
                                INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
                                WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $networkname = $r['platform'];
                }
        }