harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge groups and filed posts into activity filters

Browse Source
This commit is contained in:
Mario Vavti
2018-05-31 13:05:32 +02:00
parent 6bfc5aa96c
commit cbaaa1c57f
6 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Network.php
View File

@@ -16,7 +16,7 @@ class Network extends \Zotlabs\Web\Controller {
return;
}
if(strpos($_GET['search'], '@') === 0 || strpos($_GET['search'], '!') === 0 || strpos($_GET['search'], '?') === 0)
if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))
goaway('search' . '?f=&search=' . $_GET['search']);
if(count($_GET) < 2) {
@@ -389,7 +389,7 @@ class Network extends \Zotlabs\Web\Controller {
if($conv) {
$item_thread_top = '';
$sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ",
$sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 )) ",
dbesc(protect_sprintf($channel['channel_hash']))
);
}