Fix ostatus bug related to only_full_group_by

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index eb4ad462b5fbb3623677a43bc8673857db0cd866..56c032847c875087149a99dfea1109874a805e92 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -13,7 +13,7 @@ function contact_profile_assign($current,$foreign_net) {
                        intval($_SESSION['uid']));
 
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
                }
@@ -88,7 +88,8 @@ function network_to_name($s, $profile = "") {
                NETWORK_PUMPIO   => t('pump.io'),
                NETWORK_TWITTER  => t('Twitter'),
                NETWORK_DIASPORA2 => t('Diaspora Connector'),
-               NETWORK_STATUSNET => t('GNU Social'),
+               NETWORK_STATUSNET => t('GNU Social Connector'),
+               NETWORK_PNUT      => t('pnut'),
                NETWORK_APPNET => t('App.net')
        );
 
@@ -97,17 +98,16 @@ function network_to_name($s, $profile = "") {
        $search  = array_keys($nets);
        $replace = array_values($nets);
 
-       $networkname = str_replace($search,$replace,$s);
-
-       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND Diaspora::is_redmatrix($profile)) {
-               $networkname = t("Hubzilla/Redmatrix");
+       $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`
                                INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
                                WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''",
                                dbesc(normalise_link($profile)));
-               if ($r)
+               if (dbm::is_result($r)) {
                        $networkname = $r[0]["platform"];
+               }
        }
 
        return $networkname;