diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
| commit | 4471f580d7a50126d42690f05e81a75f7bbf8084 (patch) | |
| tree | 54e4fd3146a3978de744a39de6b7938d763852dd /include/taxonomy.php | |
| parent | e5141dd91bf483b0458b6f9226b994afbee23524 (diff) | |
| parent | e1fdac32782de11e443c7398ff3fb9870fa9b2d9 (diff) | |
| download | volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.gz volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.bz2 volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/taxonomy.php')
| -rw-r--r-- | include/taxonomy.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php index fbd2a18db..a13a9cf77 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -55,18 +55,20 @@ function term_item_parent_query($uid,$table,$s,$type = TERM_UNKNOWN, $type2 = '' $s = str_replace('*','%',$s); if($type2) { - $r = q("select parent from item left join term on term.oid = item.id where term.ttype in (%d, %d) and term.term like '%s' and term.uid = %d and term.otype = 1", + $r = q("select parent from item left join term on term.oid = item.id where term.ttype in (%d, %d) and term.term like '%s' and term.uid = %d and term.otype = 1 and item.verb != '%s'", intval($type), intval($type2), dbesc($s), - intval($uid) + intval($uid), + dbesc(ACTIVITY_UPDATE) ); } else { - $r = q("select parent from item left join term on term.oid = item.id where term.ttype = %d and term.term like '%s' and term.uid = %d and term.otype = 1", + $r = q("select parent from item left join term on term.oid = item.id where term.ttype = %d and term.term like '%s' and term.uid = %d and term.otype = 1 and item.verb != '%s'", intval($type), dbesc($s), - intval($uid) + intval($uid), + dbesc(ACTIVITY_UPDATE) ); } |