aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-31 13:05:32 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-31 13:05:32 +0200
commitcbaaa1c57ffed0b0a11a7d4cf9a492c26e577194 (patch)
tree020b83c4ce7c0fd6a3d59941c5a989d7ff846385 /Zotlabs/Module
parent6bfc5aa96c44d3a16962242d0ef02ccfa879ab7b (diff)
downloadvolse-hubzilla-cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194.tar.gz
volse-hubzilla-cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194.tar.bz2
volse-hubzilla-cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194.zip
merge groups and filed posts into activity filters
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Channel.php2
-rw-r--r--Zotlabs/Module/Network.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index c2e464470..6969b6226 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -18,7 +18,7 @@ class Channel extends \Zotlabs\Web\Controller {
function init() {
- 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']);
$which = null;
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 0d4deb736..8a381d678 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -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']))
);
}