Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 52daa2eefe6b842689baf26864c4426fd0530067..29a340afdc240c6d8b3c1c786f1c2af388f5674b 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -30,9 +30,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/conversation.php';
-require_once 'include/items.php';
-
 function network_init(App $a)
 {
        if (!local_user()) {
@@ -65,7 +62,7 @@ function network_init(App $a)
        $cid = 0;
        if (!empty($_GET['cid'])) {
                $cid = $_GET['cid'];
-               $_GET['nets'] = 'all';
+               $_GET['nets'] = '';
                $group_id = 0;
        }
 
@@ -86,7 +83,7 @@ function network_init(App $a)
 
        // fetch last used network view and redirect if needed
        if (!$is_a_date_query) {
-               $sel_nets = defaults($_GET, 'nets', false);
+               $sel_nets = defaults($_GET, 'nets', '');
                $sel_tabs = network_query_get_sel_tab($a);
                $sel_groups = network_query_get_sel_group($a);
                $last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
@@ -137,7 +134,7 @@ function network_init(App $a)
                        }
                }
 
-               if ($sel_nets !== false) {
+               if ($sel_nets) {
                        $net_args['nets'] = $sel_nets;
                }
 
@@ -151,11 +148,6 @@ function network_init(App $a)
                }
        }
 
-       // If nets is set to all, unset it
-       if (!empty($_GET['nets']) && $_GET['nets'] === 'all') {
-               unset($_GET['nets']);
-       }
-
        if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
@@ -672,7 +664,7 @@ function networkThreadedView(App $a, $update, $parent)
 
                        $entries[0] = [
                                'id' => 'network',
-                               'name' => htmlentities($contact['name']),
+                               'name' => $contact['name'],
                                'itemurl' => defaults($contact, 'addr', $contact['nurl']),
                                'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
                                'details' => $contact['location'],