diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 19:51:57 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 19:51:57 +0100 |
| commit | 90187eae37ecdee56d245f563f529638ea8f55da (patch) | |
| tree | 5f06f71871ab8df3281b50c5d3c36d640498c672 /include/zot.php | |
| parent | 3b7b3ef2bb8dce373d2184309958e790a0478371 (diff) | |
| parent | 7399f7a087b56e2f09419dc8ff99fc5ce15fa195 (diff) | |
| download | volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.gz volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.bz2 volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php index 0a1a8ee51..23fb9c4ad 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1933,11 +1933,12 @@ function remove_community_tag($sender, $arr, $uid) { return; } - q("delete from term where uid = %d and oid = %d and otype = %d and type = %d and term = '%s' and url = '%s'", + q("delete from term where uid = %d and oid = %d and otype = %d and type in ( %d, %d ) and term = '%s' and url = '%s'", intval($uid), intval($r[0]['id']), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG), dbesc($i['object']['title']), dbesc(get_rel_link($i['object']['link'],'alternate')) ); |