diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-06-02 22:39:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-06-02 22:39:36 +0200 |
| commit | 3a9f149c803fa237a0412728f9e6f92e3b28bb04 (patch) | |
| tree | c3c5da791342c4575208e24a24271e1e01d0cf6b | |
| parent | a0e4f7ddb17088a704e4cf7dff2fcba35f1cc128 (diff) | |
| parent | 5f612521da11cd4b9245909bf0a99a7431272e93 (diff) | |
| download | volse-hubzilla-3a9f149c803fa237a0412728f9e6f92e3b28bb04.tar.gz volse-hubzilla-3a9f149c803fa237a0412728f9e6f92e3b28bb04.tar.bz2 volse-hubzilla-3a9f149c803fa237a0412728f9e6f92e3b28bb04.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Widget/Activity_filter.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Forums.php | 2 | ||||
| -rw-r--r-- | include/connections.php | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 6a1ad6f0a..f9993759c 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -102,7 +102,7 @@ class Activity_filter { 'icon' => 'folder', 'url' => '#', 'sel' => (($filter_active == 'file') ? true : false), - 'title' => sprintf(t('Show posts that i have filed to %s'), $t['term']), + 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), 'sub' => $tsub ]; diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php index 7415c0f0a..d3e2f2534 100644 --- a/Zotlabs/Widget/Forums.php +++ b/Zotlabs/Widget/Forums.php @@ -51,7 +51,7 @@ class Forums { - $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 $sql_extra order by xchan_name $limit ", + $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name $limit ", intval(local_channel()) ); diff --git a/include/connections.php b/include/connections.php index 32baa94bd..5a9e31950 100644 --- a/include/connections.php +++ b/include/connections.php @@ -374,14 +374,19 @@ function contact_remove($channel_id, $abook_id) { return false; - $r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d", + $r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0", dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']), intval($channel_id) ); if($r) { + $r = fetch_post_tags($r,true); + foreach($r as $rr) { - drop_item($rr['id'],false); + $terms = get_terms_oftype($item['term'],TERM_FILE); + if(! $terms) { + drop_item($rr['id'],false); + } } } |