diff options
| author | Max Kostikov <max@kostikov.co> | 2021-03-10 19:41:46 +0000 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-03-10 19:41:46 +0000 |
| commit | b729cee9e4aaf908d28835341171311532ae05d6 (patch) | |
| tree | f47ec7020c314c9101d4ddceb222b608166d4825 /Zotlabs/Module/Network.php | |
| parent | 15b45af550cb59013cbf915c63635fdf03cdd73e (diff) | |
| parent | 15bc5c64f3f4c3226e6329f8b8aa73df4aeb5e0b (diff) | |
| download | volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.tar.gz volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.tar.bz2 volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 84c2463d6..4f9450f2f 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -20,13 +20,15 @@ class Network extends \Zotlabs\Web\Controller { return; } - if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']) || strpos($_GET['search'], 'https://') === 0) - goaway('search' . '?f=&search=' . $_GET['search']); + $search = $_GET['search'] ?? ''; + + if(in_array(substr($search, 0, 1),[ '@', '!', '?']) || strpos($search, 'https://') === 0) + goaway(z_root() . '/search?f=&search=' . $search); if(count($_GET) < 2) { $network_options = get_pconfig(local_channel(),'system','network_page_default'); if($network_options) - goaway('network' . '?f=&' . $network_options); + goaway(z_root() . '/network?f=&' . $network_options); } $channel = App::get_channel(); @@ -80,7 +82,7 @@ class Network extends \Zotlabs\Web\Controller { break; } - $search = (($_GET['search']) ? $_GET['search'] : ''); + $search = $_GET['search'] ?? ''; if($search) { if(strpos($search,'#') === 0) { $hashtags = substr($search,1); |