Merge pull request #2479 from annando/1604-vier-login

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index f104866232d4326f36cc3669636986682770b67f..3bf68f764e5597abdfd72fac05c91d1e371fd178 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -99,8 +99,16 @@ function network_to_name($s, $profile = "") {
 
        $networkname = str_replace($search,$replace,$s);
 
-       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora_is_redmatrix($profile))
-               $networkname = t("Redmatrix");
+       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora::is_redmatrix($profile)) {
+               $networkname = t("Hubzilla/Redmatrix");
+
+               $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)
+                       $networkname = $r[0]["platform"];
+       }
 
        return $networkname;
 }