Merge pull request #3284 from annando/issue-3278

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index fee569e94da5cbde46b0b346d073df1356461f06..d077a065e16590def2a304749bcc57f5fd6a50ba 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -66,6 +66,9 @@ function unavailable_networks() {
        if (!get_config("system","diaspora_enabled"))
                $networks[] = NETWORK_DIASPORA;
 
+       if (!plugin_enabled("pnut"))
+               $networks[] = NETWORK_PNUT;
+
        if (!sizeof($networks))
                return "";
 
@@ -90,7 +93,7 @@ function networks_widget($baseurl,$selected = '') {
 
        $extra_sql = unavailable_networks();
 
-       $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`",
+       $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
                intval(local_user())
        );