diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
| commit | 2108173e74c12ce590c87e673d3455f7a9b18de8 (patch) | |
| tree | 2fc06a9de42ac30c95aab864ecfd0fe2e7681d0c /include/taxonomy.php | |
| parent | b03545f89939ef1c13ca7f5a950d52fcb7f2313f (diff) | |
| parent | 08900b730bd39c00e399696472d904c1d5e4ef0b (diff) | |
| download | volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.gz volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.bz2 volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.zip | |
Merge remote-tracking branch 'mike/master' into dev
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) ); } |