diff options
| author | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
|---|---|---|
| committer | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
| commit | dfab2416926631b7b08c6c89b62528ca2520f130 (patch) | |
| tree | 6c76af9d656eec6e74ed6c3c05d7ccc2b6ef5e48 /mod/network.php | |
| parent | 09129cbe5f7e8cb331b68469b74438464960af0b (diff) | |
| parent | 7090b58f68251b8c4b39332f2ea051e95ead3df3 (diff) | |
| download | volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.gz volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.bz2 volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.zip | |
Merge remote-tracking branch 'upstream/master' into toc
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php index d444dbd59..65332e3f6 100644 --- a/mod/network.php +++ b/mod/network.php @@ -47,7 +47,7 @@ function network_content(&$a, $update = 0, $load = false) { $gid = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0); $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); - + $verb = ((x($_REQUEST,'verb')) ? $_REQUEST['verb'] : ''); $search = (($_GET['search']) ? $_GET['search'] : ''); if($search) { @@ -251,6 +251,7 @@ function network_content(&$a, $update = 0, $load = false) { '$tags' => $hashtags, '$dend' => $datequery, '$mid' => '', + '$verb' => $verb, '$dbegin' => $datequery2 )); } @@ -279,6 +280,12 @@ function network_content(&$a, $update = 0, $load = false) { } } + if($verb) { + $sql_extra .= sprintf(" AND item.verb like '%s' ", + dbesc(protect_sprintf('%' . $verb . '%')) + ); + } + if(strlen($file)) { $sql_extra .= term_query('item',$file,TERM_FILE); } |